Snap for 10992821 from 7214ce8ee8295b18871a8f3933a082351404a664 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: If3ede612a989997a545a61687788c1a20d15a30a

3 files changed, 49 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index f03803b..f3fad9b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -60,11 +60,12 @@ rust_test {
     ],
 }
 
-rust_defaults {
-    name: "android_logger_test_defaults",
-    crate_name: "android_logger",
+rust_test {
+    name: "android_logger_test_tests_config_log_level",
+    crate_name: "config_log_level",
     cargo_env_compat: true,
     cargo_pkg_version: "0.12.0",
+    srcs: ["tests/config_log_level.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -82,21 +83,47 @@ rust_defaults {
 }
 
 rust_test {
-    name: "android_logger_test_tests_config_log_level",
-    defaults: ["android_logger_test_defaults"],
-    srcs: ["tests/config_log_level.rs"],
-}
-
-rust_test {
     name: "android_logger_test_tests_default_init",
-    defaults: ["android_logger_test_defaults"],
+    crate_name: "default_init",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.12.0",
     srcs: ["tests/default_init.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+        "regex",
+    ],
+    rustlibs: [
+        "libandroid_log_sys",
+        "libandroid_logger",
+        "libenv_logger",
+        "liblog_rust",
+        "libonce_cell",
+    ],
 }
 
 rust_test {
     name: "android_logger_test_tests_multiple_init",
-    defaults: ["android_logger_test_defaults"],
+    crate_name: "multiple_init",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.12.0",
     srcs: ["tests/multiple_init.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+        "regex",
+    ],
+    rustlibs: [
+        "libandroid_log_sys",
+        "libandroid_logger",
+        "libenv_logger",
+        "liblog_rust",
+        "libonce_cell",
+    ],
 }
 
 rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 2733be4..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "no-host": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d62da6a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "tests": true,
+  "min_sdk_version": "29",
+  "package": {
+    "android_logger": {
+      "host_supported": false
+    }
+  },
+  "run_cargo": false
+}