diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:27 +0000 |
| commit | cd8f21cd8e2820518aab717dc7bda9fc588e3689 (patch) | |
| tree | 756dfc17a28ce25d3a44da77dad4d72e6979d7f7 | |
| parent | f21f40084577165667ea5d637d9c669f2d1f37c8 (diff) | |
| parent | 24ca239b9e8f3333dc94163298412327037d3d63 (diff) | |
| download | shared_child-android12L-d2-s4-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: bf8e4adbf9 am: e87e21a722 am: a908324b73 am: 24ca239b9eandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_child/+/1689917
Change-Id: Iac613e9ae88eb65659ed51e3533f822e7e537b3e
| -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 { |