Snap for 8564071 from 50da566a2736365b9ff79a133bbf486ce32480b4 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android13-mainline-permission-release

Change-Id: I5fff6d513969e0cfc630a734de108eac322ebee4

1 files changed, 48 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 4339cae..6a110ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,29 +37,57 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "bitflags_defaults",
-    crate_name: "bitflags",
+rust_test {
+    name: "bitflags_test_src_lib",
     // has rustc warnings
+    host_supported: true,
+    crate_name: "bitflags",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.3.2",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    edition: "2015",
-    features: ["default"],
-    cfgs: ["bitflags_const_fn"],
-}
-
-rust_test_host {
-    name: "bitflags_host_test_src_lib",
-    defaults: ["bitflags_defaults"],
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: ["default"],
+    rustlibs: [
+        "libserde",
+        "libserde_json",
+        "libwalkdir",
+    ],
+    proc_macros: [
+        "librustversion",
+        "libserde_derive",
+    ],
 }
 
 rust_test {
-    name: "bitflags_device_test_src_lib",
-    defaults: ["bitflags_defaults"],
+    name: "bitflags_test_tests_basic",
+    // has rustc warnings
+    host_supported: true,
+    crate_name: "bitflags",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.3.2",
+    srcs: ["tests/basic.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2018",
+    features: ["default"],
+    rustlibs: [
+        "libbitflags",
+        "libserde",
+        "libserde_json",
+        "libwalkdir",
+    ],
+    proc_macros: [
+        "librustversion",
+        "libserde_derive",
+    ],
 }
 
 rust_library {
@@ -67,12 +95,17 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "bitflags",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.3.2",
     srcs: ["src/lib.rs"],
-    edition: "2015",
+    edition: "2018",
     features: ["default"],
-    cfgs: ["bitflags_const_fn"],
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
+        "com.android.compos",
         "com.android.virt",
     ],
+    vendor_available: true,
+    min_sdk_version: "29",
 }