diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:04 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:04 +0000 |
commit | a1486d42456df060d5cb1af492a768172f68b304 (patch) | |
tree | 8aa33bfe69d31d520c9f1aa0b31ed2e4683f5595 | |
parent | 655ca3a8792cc4a102853e6f99ab94bb13088889 (diff) | |
parent | 0508ccd77663713347040e849ad3e1fc97bf495d (diff) | |
download | spin-a1486d42456df060d5cb1af492a768172f68b304.tar.gz |
Snap for 7325276 from 0508ccd77663713347040e849ad3e1fc97bf495d to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: I89c0d3365b7666b7458bc1aae9d10f733f50a6e8
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 12 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 17 insertions, 11 deletions
@@ -1,4 +1,5 @@ -// 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 { default_applicable_licenses: ["external_rust_crates_spin_license"], diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..5441827 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,12 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "patch": "patches/Android.bp.patch", + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index e8aa924..f606cb9 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,22 +2,15 @@ diff --git a/Android.bp b/Android.bp index 96531ab..43db8ef 100644 --- a/Android.bp +++ b/Android.bp -@@ -8,8 +8,14 @@ rust_library { +@@ -39,6 +39,7 @@ rust_library { edition: "2015", features: [ "default", + "std", "ticket_mutex", ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { -@@ -21,6 +27,7 @@ rust_defaults { + apex_available: [ +@@ -56,6 +62,7 @@ rust_defaults { edition: "2015", features: [ "default", |