diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:37 +0000 |
commit | 66b742eb12bb7c2ec7a4bedf6846cde5007a7910 (patch) | |
tree | 8cab78e20c4344228f35b5aa8a47039926a4f317 | |
parent | 3fbbaa2e651ff11277566ff6dd2283095e60adee (diff) | |
parent | 48e56b3a336f975786f2755e53d14d0739f18359 (diff) | |
download | intrusive-collections-66b742eb12bb7c2ec7a4bedf6846cde5007a7910.tar.gz |
Generate apex_available from c2a instead of a patch am: 47e66dd500 am: 48e56b3a33
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/intrusive-collections/+/1688979
Change-Id: I25165e890653160810eb905558aedf33cd2f1327
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 20 |
3 files changed, 18 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --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. // TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate // (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. @@ -42,6 +43,7 @@ license { rust_library { name: "libintrusive_collections", + // has rustc warnings host_supported: true, crate_name: "intrusive_collections", srcs: ["src/lib.rs"], diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..623aa56 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "patch": "patches/Android.bp.patch", + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 15d6516..f0c7569 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,21 +2,11 @@ diff --git a/Android.bp b/Android.bp index 9e3c084..d4334b6 100644 --- a/Android.bp +++ b/Android.bp -@@ -1,4 +1,6 @@ - // This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch. +@@ -1,5 +1,7 @@ + // This file is generated by cargo2android.py --config cargo2android.json. + // Do not modify this file as changes will be overridden on upgrade. +// TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate +// (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. - rust_library { - name: "libintrusive_collections", -@@ -13,6 +15,10 @@ rust_library { - rustlibs: [ - "libmemoffset", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] + package { + default_applicable_licenses: [ |