diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:14 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:14 +0000 |
commit | 235540f14dd87276980a8a403188c1213c297bd0 (patch) | |
tree | 9a0d8f711d29ef10cada1eca97bdda6252989cd9 | |
parent | 220aedb5d30a1e879a112287a462839dad6acaff (diff) | |
parent | 79401926776fe75253e92c83c8ebc92a99e248d9 (diff) | |
download | untrusted-android12-s2-release.tar.gz |
Snap for 7325276 from 79401926776fe75253e92c83c8ebc92a99e248d9 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: I8b67364bf7044b3cb8be7d7f33f9fd5c3285c3af
-rw-r--r-- | Android.bp | 12 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 22 insertions, 17 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_untrusted_license"], @@ -19,6 +20,7 @@ license { rust_library { name: "libuntrusted", + // has rustc warnings host_supported: true, crate_name: "untrusted", srcs: ["src/untrusted.rs"], @@ -33,6 +35,7 @@ rust_library { rust_defaults { name: "untrusted_defaults", crate_name: "untrusted", + // has rustc warnings srcs: ["src/untrusted.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -42,6 +45,9 @@ rust_defaults { rust_test_host { name: "untrusted_host_test_src_untrusted", defaults: ["untrusted_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -52,6 +58,7 @@ rust_test { rust_defaults { name: "untrusted_defaults_tests", crate_name: "tests", + // has rustc warnings srcs: ["tests/tests.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -64,6 +71,9 @@ rust_defaults { rust_test_host { name: "untrusted_host_test_tests_tests", defaults: ["untrusted_defaults_tests"], + test_options: { + unit_test: true, + }, } rust_test { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..911c36f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "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 90cc841..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 52ab13d..eaf9020 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,11 @@ rust_library { - crate_name: "untrusted", - srcs: ["src/untrusted.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |