Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 492cf57a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Import macro directly rather than using #[macro_use]." am: d30f8081... 

Merge "Import macro directly rather than using #[macro_use]." am: d30f8081 am: 9b495caa am: 805c23c8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2392889



Change-Id: Id06f5a1b2e31b6be21a2ef85db547a12a42adbda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64e5571e 805c23c8

libs/binder/rust/src/lib.rs

+1 −3
Original line number Diff line number Diff line
@@ -93,15 +93,13 @@ 
//! }

//! ```



#[macro_use]

mod proxy;



#[macro_use]

mod binder;

mod binder_async;

mod error;

mod native;

mod parcel;

mod proxy;

mod state;



use binder_ndk_sys as sys;

libs/binder/rust/tests/parcel_fuzzer/parcel_fuzzer.rs

+1 −4
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
#![allow(missing_docs)]

#![no_main]



#[macro_use]

extern crate libfuzzer_sys;



mod read_utils;



use crate::read_utils::READ_FUNCS;
@@ -31,7 +28,7 @@ use binder::{ 
    StatusCode,

};

use binder_random_parcel_rs::create_random_parcel;

use libfuzzer_sys::arbitrary::Arbitrary;

use libfuzzer_sys::{arbitrary::Arbitrary, fuzz_target};



#[derive(Arbitrary, Debug)]

enum ReadOperation {

libs/binder/rust/tests/parcel_fuzzer/random_parcel/fuzz_service_test/service_fuzzer.rs

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#![allow(missing_docs)]

#![no_main]

#[macro_use]

extern crate libfuzzer_sys;



use libfuzzer_sys::fuzz_target;



use binder::{self, BinderFeatures, Interface};

use binder_random_parcel_rs::fuzz_service;