From ce050857d8a553bf4d1992256521bde0a73553dd Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 9 Aug 2021 09:01:16 +0900
Subject: [PATCH] aidl: Remove ndk_platform backend. Use the ndk backend.

The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.

Bug: 161456198
Test: m
Merged-In: I14a1c57bd06f1f2aa52491f779c7030d4de03547
Change-Id: I7b9055909b901843631314b9577a9e578a739d00
---
 aidl/light/Android.bp            | 2 +-
 aidl/power-libperfmgr/Android.bp | 4 ++--
 aidl/vibrator/Android.bp         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aidl/light/Android.bp b/aidl/light/Android.bp
index 1b2322cf..ec2a10a7 100644
--- a/aidl/light/Android.bp
+++ b/aidl/light/Android.bp
@@ -17,7 +17,7 @@ cc_binary {
     shared_libs: [
         "libbase",
         "libbinder_ndk",
-        "android.hardware.light-V1-ndk_platform",
+        "android.hardware.light-V1-ndk",
     ],
     vendor: true,
 }
diff --git a/aidl/power-libperfmgr/Android.bp b/aidl/power-libperfmgr/Android.bp
index 93186fbd..2c3bb2a0 100644
--- a/aidl/power-libperfmgr/Android.bp
+++ b/aidl/power-libperfmgr/Android.bp
@@ -27,14 +27,14 @@ cc_binary {
     vintf_fragments: ["android.hardware.power-service.samsung.xml"],
     vendor: true,
     shared_libs: [
-        "android.hardware.power-V1-ndk_platform",
+        "android.hardware.power-V1-ndk",
         "libbase",
         "libcutils",
         "liblog",
         "libutils",
         "libbinder_ndk",
         "libperfmgr",
-        "pixel-power-ext-V1-ndk_platform",
+        "pixel-power-ext-V1-ndk",
     ],
     srcs: [
         "service.cpp",
diff --git a/aidl/vibrator/Android.bp b/aidl/vibrator/Android.bp
index 097301ca..0a255a18 100644
--- a/aidl/vibrator/Android.bp
+++ b/aidl/vibrator/Android.bp
@@ -16,7 +16,7 @@ cc_binary {
     shared_libs: [
         "libbase",
         "libbinder_ndk",
-        "android.hardware.vibrator-V2-ndk_platform",
+        "android.hardware.vibrator-V2-ndk",
     ],
     vendor: true,
 }