Fix build in AOSP am: fcb3bc12c4 am: e34cc01c07

Original change: https://android-review.googlesource.com/c/platform/external/rust/cros-libva/+/3393139

Change-Id: I90b4929a06e31cd0e54d1b2bde6cdb8f642218af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/Android.bp

diff --git a/android/Android.bp b/android/Android.bp
index 355c850..f01d665 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -17,6 +17,12 @@
     clippy_lints: "android",
 
     vendor: true,
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
 }
 
 rust_bindgen {

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
index f97ac4d..f4e52c7 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -6,5 +6,4 @@
       }
     },
     "run_cargo": false,
-    "tests": true
 }

lib/Android.bp

diff --git a/lib/Android.bp b/lib/Android.bp
index 16b5d3b..7c31eb9 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -9,36 +9,6 @@
     default_applicable_licenses: ["external_rust_cros-libva_license"],
 }
 
-rust_test {
-    name: "cros-libva_test_src_lib",
-    crate_name: "cros_libva",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.0.8",
-    crate_root: "src/lib.rs",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2021",
-    rustlibs: [
-        "libbitflags",
-        "libcrc32fast",
-        "liblog_rust",
-        "libthiserror",
-    ],
-
-    vendor: true,
-    enabled: false,
-    arch: {
-        x86_64: {
-            enabled: true,
-            // Bindgen-generated bindings of our local libva headers.
-            srcs: [":libcros_libva_bindgen"],
-        },
-    },
-}
-
 rust_library {
     name: "libcros_libva",
     crate_name: "cros_libva",
@@ -63,7 +33,7 @@
             enabled: true,
             // Bindgen-generated bindings of our local libva headers.
             srcs: [":libcros_libva_bindgen"],
-            shared_libs: [ "libva" ],
+            shared_libs: ["libva"],
         },
     },
 }