diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:49 +0000 |
commit | 9b2d6414abe6fb7417dbf12916116e903fdea56a (patch) | |
tree | e6f627a343a242df90b3dd569500d6b6ca938fd8 | |
parent | 55a47278c91a380fb3ba982869d600d6d3544ff0 (diff) | |
parent | a8fea1d9126e291a7555d78a5cee02833e3316fe (diff) | |
download | futures-channel-9b2d6414abe6fb7417dbf12916116e903fdea56a.tar.gz |
Generate apex_available from c2a instead of a patch am: a8fea1d912
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765
Change-Id: If51178329628016c1ce17dedf5a6d739feea8710
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 11 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --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 { @@ -62,4 +62,4 @@ rust_library { } // dependent_library ["feature_list"] -// futures-core-0.3.13 "alloc,std" +// futures-core-0.3.14 "alloc,std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "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 56dc707..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 737bcea..2ccbba4 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -14,6 +14,10 @@ rust_library { - rustlibs: [ - "libfutures_core", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |