commit 64ea883e609bfc24d28c28ea08c143b51b020cad
author Jiyong Park <jiyong@google.com> Tue Jul 27 18:23:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 27 18:23:41 2021 +0000
tree bbd31032820f9168093b4e16589b3ed71741531a
parent ebaf75ec039618d2b56ebdd1a2ce5792fd558ca6
parent 9f6f8e663ddd17405dbd6e3c55174af38cec3986

Remove ndk_platform backend. Use the ndk backend. am: 9f6f8e663d

Original change: https://android-review.googlesource.com/c/device/google/trout/+/1779307

Change-Id: I60aff3ff42b8972844a75946881c910d8f265e68

hal/audiocontrol/2.0/Android.bp

diff --git a/hal/audiocontrol/2.0/Android.bp b/hal/audiocontrol/2.0/Android.bp
index abb759a..4d1ec1a 100644
--- a/hal/audiocontrol/2.0/Android.bp
+++ b/hal/audiocontrol/2.0/Android.bp
@@ -104,7 +104,7 @@
     shared_libs: [
         "android.hardware.audiocontrol@2.0-service-audio-control-grpc-server",
         "android.hardware.automotive.utils.watchdog",
-        "carwatchdog_aidl_interface-V2-ndk_platform",
+        "carwatchdog_aidl_interface-V2-ndk",
         "libbinder_ndk",
         "libcutils",
     ],

hal/common/android/watchdog/Android.bp

diff --git a/hal/common/android/watchdog/Android.bp b/hal/common/android/watchdog/Android.bp
index 503d27c..bdcbd71 100644
--- a/hal/common/android/watchdog/Android.bp
+++ b/hal/common/android/watchdog/Android.bp
@@ -27,7 +27,7 @@
     ],
     export_include_dirs: ["."],
     shared_libs: [
-        "carwatchdog_aidl_interface-V2-ndk_platform",
+        "carwatchdog_aidl_interface-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libhidlbase",

hal/dumpstate/1.1/Android.bp

diff --git a/hal/dumpstate/1.1/Android.bp b/hal/dumpstate/1.1/Android.bp
index f352c97..2b08104 100644
--- a/hal/dumpstate/1.1/Android.bp
+++ b/hal/dumpstate/1.1/Android.bp
@@ -71,7 +71,7 @@
         "android.hardware.automotive.utils.watchdog",
         "android.hardware.dumpstate@1.0",
         "android.hardware.dumpstate@1.1",
-        "carwatchdog_aidl_interface-V2-ndk_platform",
+        "carwatchdog_aidl_interface-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libcutils",