diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:41 +0000 |
commit | 79401926776fe75253e92c83c8ebc92a99e248d9 (patch) | |
tree | 9a0d8f711d29ef10cada1eca97bdda6252989cd9 | |
parent | cd15ec95a78610ef5003fd43d9cef6007a4ef2ef (diff) | |
parent | f7390452d877fbb893d2350934a294ede98df5df (diff) | |
download | untrusted-79401926776fe75253e92c83c8ebc92a99e248d9.tar.gz |
Merge "Generate apex_available from c2a instead of a patch" am: 3f3463b5ea am: afce7ce1a7 am: f7390452d8android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1690065
Change-Id: I38e2bbf9f65334a5a368284f0861887dc9db2b41
-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 { |