commit 6eea2ff346361fc4d1cb09bed5f4ca9ec97f2cc7
author Shunkai Yao <yaoshunkai@google.com> Tue Dec 19 00:19:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 19 00:19:55 2023 +0000
tree 08a047a68e714b3e70294fe4864c00071bceea96
parent 12e8aba235aa4a1f43486ed7a36733d583ca5e75
parent f60fc373d932fa619da333c7f0e8498881df2361

Merge "Spatializer default implementatoin with VTS" into main

media/c2/aidl/Android.bp

diff --git a/media/c2/aidl/Android.bp b/media/c2/aidl/Android.bp
index 3c0915d..84cb382 100644
--- a/media/c2/aidl/Android.bp
+++ b/media/c2/aidl/Android.bp
@@ -42,11 +42,8 @@
             ],
         },
         rust: {
-            min_sdk_version: "31",
-            enabled: true,
-            additional_rustlibs: [
-                "libnativewindow_rs",
-            ],
+            // No users, and no rust implementation of android.os.Surface yet
+            enabled: false,
         },
     },
 }

sensors/aidl/default/multihal/Android.bp

diff --git a/sensors/aidl/default/multihal/Android.bp b/sensors/aidl/default/multihal/Android.bp
index a20d6d7..40cb2d9 100644
--- a/sensors/aidl/default/multihal/Android.bp
+++ b/sensors/aidl/default/multihal/Android.bp
@@ -45,11 +45,6 @@
         "HalProxyAidl.cpp",
         "ConvertUtils.cpp",
     ],
-    visibility: [
-        ":__subpackages__",
-        "//hardware/interfaces/sensors/aidl/multihal:__subpackages__",
-        "//hardware/interfaces/tests/extension/sensors:__subpackages__",
-    ],
     static_libs: [
         "android.hardware.sensors@1.0-convert",
         "android.hardware.sensors@2.X-multihal",