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 | 4f1f371c6a8b3e7c04c94628191bb6eda3955d53 (patch) | |
tree | 95d23281f1be722c5e7ff14d322b70b0a5120db1 | |
parent | b03aa691f77328178abb60c8a21df149e602952e (diff) | |
parent | 7ff3771e08c8986974cba124dcccb529c8f78fc9 (diff) | |
download | slab-android-platform-12.0.0_r30.tar.gz |
Snap for 7325276 from 7ff3771e08c8986974cba124dcccb529c8f78fc9 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_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_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: I56e84f5b5b296114cee9330cd913a15e5332aeea
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 18 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// 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 { default_applicable_licenses: ["external_rust_crates_slab_license"], @@ -41,6 +42,9 @@ rust_defaults { rust_test_host { name: "slab_host_test_src_lib", defaults: ["slab_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -63,6 +67,9 @@ rust_defaults { rust_test_host { name: "slab_host_test_tests_slab", defaults: ["slab_defaults_slab"], + test_options: { + unit_test: true, + }, } rust_test { 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 acfab60..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 81236b0..18997c4 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,10 @@ rust_library { - crate_name: "slab", - srcs: ["src/lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - rust_defaults { |