diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:46 +0000 |
| commit | de595d83f7c89c21e4f97ce775b94c5029424e80 (patch) | |
| tree | e6f627a343a242df90b3dd569500d6b6ca938fd8 | |
| parent | c60c4423cfaad22f0d918281068792fdcfe5dba4 (diff) | |
| parent | 84aa6e7a6497f18089d3f3d4fc1c19c35050e2cc (diff) | |
| download | futures-channel-android12-qpr1-d-s1-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: a8fea1d912 am: 9b2d6414ab am: 84aa6e7a64android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765
Change-Id: Id2c337116df5e3861dff0e50756125bd4bbaafb1
| -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"] |