diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:53 +0000 |
commit | e87e21a722588da2bf7ec940a237846c640fba3e (patch) | |
tree | 756dfc17a28ce25d3a44da77dad4d72e6979d7f7 | |
parent | 5487c2f543d2ded61c3a94117fea43032851aa88 (diff) | |
parent | bf8e4adbf9f01c823feeb06d7ab35e08caf711ca (diff) | |
download | shared_child-android-s-beta-4.tar.gz |
Generate apex_available from c2a instead of a patch am: bf8e4adbf9android-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_child/+/1689917
Change-Id: I6be207ef6fe942eb2180315027fed523bb263cdf
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 12 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --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 { @@ -59,4 +59,4 @@ rust_test { } // dependent_library ["feature_list"] -// libc-0.2.93 "default,std" +// libc-0.2.94 "default,std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..ac56e26 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index cd87fe5..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 79874d6..65f30d3 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -10,6 +10,10 @@ rust_library { - rustlibs: [ - "liblibc", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - rust_defaults { |