commit 28c81f19489b50a560dd124d74c144475139d15d
author Lais Andrade <lsandrade@google.com> Mon Jun 24 14:32:22 2024 +0100
committer Lais Andrade <lsandrade@google.com> Wed Jul 03 15:49:00 2024 +0100
tree 6bf14f9729d03296760eb177a709e9f145e421f2
parent ce51bf0fb0a0eedc1d2fb55d58c6abd9629a102f

Disable cpp backend for android.hardware.vibrator

Disable CPP backend for vibrator HAL. Dependencies should use the
stable NDK instead.

This is also the recommended choice:

https://source.android.com/docs/core/architecture/aidl/aidl-hals#choosing-runtime

The HAL will be allowed to use ndk-stable types like PersistableBundle
after disabling the legacy CPP backend.

Fix: 349595412
Test: VtsHalVibratorTargetTest & VtsHalVibratorManagerTargetTest
Flag: EXEMPT NDK
Change-Id: Id5736e092afd36e786ecf3978ff6ad81c7a4df56

vibrator/aidl/vts/Android.bp

diff --git a/vibrator/aidl/vts/Android.bp b/vibrator/aidl/vts/Android.bp
index b6d2fb2..166b30b 100644
--- a/vibrator/aidl/vts/Android.bp
+++ b/vibrator/aidl/vts/Android.bp
@@ -17,10 +17,10 @@
     tidy_timeout_srcs: ["VtsHalVibratorTargetTest.cpp"],
     srcs: ["VtsHalVibratorTargetTest.cpp"],
     shared_libs: [
-        "libbinder",
+        "libbinder_ndk",
     ],
     static_libs: [
-        "android.hardware.vibrator-V2-cpp",
+        "android.hardware.vibrator-V2-ndk",
     ],
     test_suites: [
         "general-tests",
@@ -36,10 +36,10 @@
     ],
     srcs: ["VtsHalVibratorManagerTargetTest.cpp"],
     shared_libs: [
-        "libbinder",
+        "libbinder_ndk",
     ],
     static_libs: [
-        "android.hardware.vibrator-V2-cpp",
+        "android.hardware.vibrator-V2-ndk",
     ],
     test_suites: [
         "general-tests",