diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:11 +0000 |
commit | 01994b877f9ebbc7538956ca04525fc151f328f6 (patch) | |
tree | 756dfc17a28ce25d3a44da77dad4d72e6979d7f7 | |
parent | 2b2cf6237c6356a82082cac6d37e51c8aad2e7b5 (diff) | |
parent | 24ca239b9e8f3333dc94163298412327037d3d63 (diff) | |
download | shared_child-android12-d1-s4-release.tar.gz |
Snap for 7325096 from 24ca239b9e8f3333dc94163298412327037d3d63 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: I99e48437ed81215e9656a1d598cc48986d92ffbd
-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 { |