commit 842b48f0cf6ffa5f67bd7a66a6463b5acb074f65
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 19 00:37:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 19 00:37:31 2023 +0000
tree 472cf3375e60fdc799d4c54c325d25271cfd25af
parent 73c2e944f694a73202b9d4e7d98440bd52cd33bc
parent 9cbc36cb4a9a8c626b3c2b27f9b616e6fe73f00a

Merge "Disable the rust backend of android.hardware.media.c2" into main am: 12e8aba235 am: 9cbc36cb4a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2880987

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

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,
         },
     },
 }