diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-09 17:04:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 17:04:55 +0000 |
| commit | 5c89488feb95f26d3d69bdf851313cdf5f5b1f9e (patch) | |
| tree | 5af962ea31ba0f8d9a286b3fdcf9887c3d37f6aa | |
| parent | 20420b19577e0677b49adc48515cf492ecb76510 (diff) | |
| parent | 33ce0fc5fd89deb061c6e1e92889bb0e79ba5902 (diff) | |
| download | libfuzzer-sys-5c89488feb95f26d3d69bdf851313cdf5f5b1f9e.tar.gz | |
Remove patch by using new cargo2android.py features. am: 34b59d198a am: b576861175 am: 33ce0fc5fd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libfuzzer-sys/+/1730910
Change-Id: Ia3ef7ba96310405f7711d6c962472d372ddc1417
| -rw-r--r-- | Android.bp | 16 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 25 |
3 files changed, 19 insertions, 33 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --features arbitrary-derive --patch patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -41,16 +41,16 @@ rust_library_rlib { srcs: ["src/lib.rs"], edition: "2018", features: ["arbitrary-derive"], - rlibs: [ + rustlibs: [ "libarbitrary", ], } // dependent_library ["feature_list"] -// arbitrary-1.0.0 "derive,derive_arbitrary" -// cc-1.0.67 -// derive_arbitrary-1.0.0 -// proc-macro2-1.0.26 "default,proc-macro" +// arbitrary-1.0.1 "derive,derive_arbitrary" +// cc-1.0.68 +// derive_arbitrary-1.0.1 +// proc-macro2-1.0.27 "default,proc-macro" // quote-1.0.9 "default,proc-macro" -// syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote" -// unicode-xid-0.2.1 "default" +// syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote" +// unicode-xid-0.2.2 "default" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..01e723e --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "dependencies": true, + "device": true, + "features": "arbitrary-derive", + "force-rlib": true, + "lib-blocklist": [ + "fuzzer", + "stdc++" + ], + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index c0d6fd7..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 86434dd..e565b86 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -1,17 +1,15 @@ - // This file is generated by cargo2android.py --run --dependencies --device --features arbitrary-derive --patch patches/Android.bp.patch. - --rust_library { -+rust_library_rlib { - name: "liblibfuzzer_sys", - host_supported: true, - crate_name: "libfuzzer_sys", - srcs: ["src/lib.rs"], - edition: "2018", - features: ["arbitrary-derive"], -- rustlibs: [ -+ rlibs: [ - "libarbitrary", - ], -- static_libs: ["libfuzzer"], -- shared_libs: ["libstdc++"], - } - - // dependent_library ["feature_list"] - |