Allow android_logger crate in com.android.virt apex

Also add TEST_MAPPING generated by the script.

Bug: 182570135
Test: m
Change-Id: Icba0ea3fdd6b958bdc6f617a87f51d8d1d082484

3 files changed, 32 insertions, 45 deletions

diff --git a/Android.bp b/Android.bp
index 63c0159..ff51201 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,42 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --no-host --tests.
-
-package {
-    default_applicable_licenses: [
-        "external_rust_crates_android_logger_license",
-    ],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_rust_crates_android_logger_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-MIT",
-    ],
-    license_text: [
-        "LICENSE-APACHE",
-        "LICENSE-MIT",
-    ],
-}
+// This file is generated by cargo2android.py --run --dependencies --device --no-host --tests --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
 
 rust_test {
     name: "android_logger_device_test_src_lib",
@@ -72,16 +35,19 @@ rust_library {
         "liblazy_static",
         "liblog_rust",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 // dependent_library ["feature_list"]
 //   aho-corasick-0.7.15 "default,std"
 //   android_log-sys-0.2.0
-//   cfg-if-0.1.10
+//   cfg-if-1.0.0
 //   env_logger-0.7.1 "regex"
 //   lazy_static-1.4.0
-//   log-0.4.11 "std"
+//   log-0.4.14 "std"
 //   memchr-2.3.4 "default,std,use_std"
-//   regex-1.4.2 "aho-corasick,default,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std,thread_local,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
-//   regex-syntax-0.6.21 "default,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
-//   thread_local-1.0.1
+//   regex-1.4.4 "aho-corasick,default,memchr,perf,perf-cache,perf-dfa,perf-inline,perf-literal,std,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
+//   regex-syntax-0.6.23 "default,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index dabccd6..8cee718 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,14 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
 {
   "presubmit": [
     {
+      "name": "keystore2_test"
+    },
+    {
       "name": "android_logger_device_test_src_lib"
+    },
+    {
+      "name": "keystore2_selinux_test"
     }
   ]
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..17eea13
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index a7d9bc2..5bba4d9 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -35,6 +35,10 @@ rust_library {
+         "liblazy_static",
+         "liblog_rust",
+     ],
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }
+ 
+ // dependent_library ["feature_list"]