Merge "Generate apex_available from c2a instead of a patch" am: 3f3463b5ea am: afce7ce1a7 am: f7390452d8 am: 7940192677android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1690065

Change-Id: I1351eeb09bad5df8316157b2d590e7f77ed2b76e

3 files changed, 22 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 539722d..cab84c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 {