Snap for 8188146 from 391daa57cf17e596315e926d98307c277288703b to tm-frc-media-release

Change-Id: I80ebbd62f7c560e8e4b37de8160cbe98c8a689da

3 files changed, 30 insertions, 95 deletions

diff --git a/Android.bp b/Android.bp
index 056c310..d156d87 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,10 +40,8 @@ license {
 }
 
 rust_test {
-    name: "android_logger_test_src_lib",
+    name: "android_logger_device_test_src_lib",
     crate_name: "android_logger",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.10.1",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -61,10 +59,8 @@ rust_test {
 }
 
 rust_defaults {
-    name: "android_logger_test_defaults",
+    name: "android_logger_defaults",
     crate_name: "android_logger",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.10.1",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -82,28 +78,26 @@ rust_defaults {
 }
 
 rust_test {
-    name: "android_logger_test_tests_config_log_level",
-    defaults: ["android_logger_test_defaults"],
+    name: "android_logger_device_test_tests_config_log_level",
+    defaults: ["android_logger_defaults"],
     srcs: ["tests/config_log_level.rs"],
 }
 
 rust_test {
-    name: "android_logger_test_tests_default_init",
-    defaults: ["android_logger_test_defaults"],
+    name: "android_logger_device_test_tests_default_init",
+    defaults: ["android_logger_defaults"],
     srcs: ["tests/default_init.rs"],
 }
 
 rust_test {
-    name: "android_logger_test_tests_multiple_init",
-    defaults: ["android_logger_test_defaults"],
+    name: "android_logger_device_test_tests_multiple_init",
+    defaults: ["android_logger_defaults"],
     srcs: ["tests/multiple_init.rs"],
 }
 
 rust_library {
     name: "libandroid_logger",
     crate_name: "android_logger",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.10.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -118,12 +112,19 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
         "com.android.resolv",
-        "com.android.uwb",
         "com.android.virt",
     ],
-    vendor_available: true,
     min_sdk_version: "29",
 }
+
+// dependent_library ["feature_list"]
+//   aho-corasick-0.7.15 "default,std"
+//   android_log-sys-0.2.0
+//   cfg-if-1.0.0
+//   env_logger-0.8.3 "regex"
+//   lazy_static-1.4.0
+//   log-0.4.14 "std"
+//   memchr-2.3.4 "default,std,use_std"
+//   regex-1.4.6 "aho-corasick,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std"
+//   regex-syntax-0.6.23
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7fc7922..813e886 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,102 +2,40 @@
 {
   "presubmit": [
     {
-      "name": "android_logger_test_src_lib"
+      "name": "android_logger_device_test_src_lib"
     },
     {
-      "name": "android_logger_test_tests_config_log_level"
+      "name": "android_logger_device_test_tests_config_log_level"
     },
     {
-      "name": "android_logger_test_tests_default_init"
+      "name": "android_logger_device_test_tests_default_init"
     },
     {
-      "name": "android_logger_test_tests_multiple_init"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
+      "name": "android_logger_device_test_tests_multiple_init"
     },
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
       "name": "keystore2_selinux_test"
     },
     {
       "name": "keystore2_test"
     },
     {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "open_then_run_module"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "android_logger_test_src_lib"
-    },
-    {
-      "name": "android_logger_test_tests_config_log_level"
-    },
-    {
-      "name": "android_logger_test_tests_default_init"
-    },
-    {
-      "name": "android_logger_test_tests_multiple_init"
+      "name": "logger_device_test_config_log_level"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "name": "logger_device_test_default_init"
     },
     {
-      "name": "doh_unit_test"
+      "name": "logger_device_test_env_log_level"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
+      "name": "logger_device_test_multiple_init"
     },
     {
       "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "open_then_run_module"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 18ba06d..d02b87d 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,17 +1,13 @@
 {
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
     "com.android.resolv",
-    "com.android.uwb",
     "com.android.virt"
   ],
+  "min_sdk_version": "29",
   "dependencies": true,
   "device": true,
-  "min-sdk-version": "29",
   "no-host": true,
   "run": true,
-  "tests": true,
-  "vendor-available": true
-}
+  "tests": true
+}
\ No newline at end of file