diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:27 +0000 |
commit | 3ba0e580981248ef6a07a3556b668ddc03b7ee8e (patch) | |
tree | da2c1c8ccc04febb2db96fb78408a2f1335d4656 | |
parent | 7a1878e419b71090ed030db34a6ef1bb39f64448 (diff) | |
parent | dc7869c0e68e86dace05f1543925f7a13fe1114b (diff) | |
download | futures-sink-3ba0e580981248ef6a07a3556b668ddc03b7ee8e.tar.gz |
Snap for 7325096 from dc7869c0e68e86dace05f1543925f7a13fe1114b to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I4e5f50d08b76a8e019a45a2ee47a643ac12cd7fd
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 11 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --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 { 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 4305fea..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index a740016..b16050a 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -35,4 +35,8 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |