Set vendor: true to libcros_libva

chromeos · Oct 29, 2024 · 2be2ee2 · 2be2ee2
1 parent 1705dfc
commit 2be2ee2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/android/Android.bp b/android/Android.bp
@@ -15,8 +15,8 @@ rust_binary_host {
     ],
     lints: "android",
     clippy_lints: "android",
-    product_available: true,
-    vendor_available: true,
+
+    vendor: true,
 }
 
 rust_bindgen {
@@ -26,18 +26,15 @@ rust_bindgen {
     wrapper_src: "android_wrapper.h",
     source_stem: "bindings",
     cflags: ["-I external/rust/crates/cros-libva/lib"],
-    product_available: true,
-    vendor_available: true,
     visibility: ["//external/rust/crates/cros-libva/lib"],
 
-    // Libva headers that bindings source is generated from.
+    vendor: true,
+    enabled: false,
     arch: {
         x86_64: {
-            // Bindgen-generated bindings of our local libva headers.
-            header_libs: [
-                "libva_headers",
-            ],
+            enabled: true,
+            // Libva headers that bindings source is generated from.
+            header_libs: ["libva_headers"],
         },
     },
-
 }
diff --git a/lib/Android.bp b/lib/Android.bp
@@ -28,8 +28,15 @@ rust_test {
         "libthiserror",
     ],
 
-    // Bindgen-generated bindings of our local libva headers.
-    srcs: [":libcros_libva_bindgen"],
+    vendor: true,
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+            // Bindgen-generated bindings of our local libva headers.
+            srcs: [":libcros_libva_bindgen"],
+        },
+    },
 }
 
 rust_library {
@@ -48,13 +55,14 @@ rust_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    product_available: true,
-    vendor_available: true,
 
+    vendor: true,
+    enabled: false,
     arch: {
         x86_64: {
+            enabled: true,
             // Bindgen-generated bindings of our local libva headers.
             srcs: [":libcros_libva_bindgen"],
-        }
+        },
     },
 }