From c426c6dbdc8db86cc35d15cca6fb2b703280e4c2 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 4 Aug 2021 12:48:07 +0900 Subject: [PATCH] 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 Change-Id: I0652f1efe920111d79dd8c2ecd52e55dda54538f --- automotive/audiocontrol/aidl/default/Android.bp | 4 ++-- automotive/vehicle/2.0/default/Android.bp | 10 +++++----- biometrics/face/aidl/default/Android.bp | 4 ++-- biometrics/face/aidl/vts/Android.bp | 8 ++++---- biometrics/fingerprint/aidl/default/Android.bp | 4 ++-- biometrics/fingerprint/aidl/vts/Android.bp | 6 +++--- gnss/1.1/default/Android.bp | 2 +- gnss/2.0/default/Android.bp | 2 +- gnss/2.1/default/Android.bp | 2 +- gnss/aidl/default/Android.bp | 2 +- gnss/common/utils/default/Android.bp | 2 +- power/aidl/default/Android.bp | 2 +- power/aidl/vts/Android.bp | 2 +- tests/extension/vibrator/aidl/client/Android.bp | 4 ++-- tests/extension/vibrator/aidl/default/Android.bp | 4 ++-- tv/tuner/aidl/default/Android.bp | 4 ++-- tv/tuner/aidl/vts/functional/Android.bp | 6 +++--- vibrator/aidl/default/Android.bp | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/automotive/audiocontrol/aidl/default/Android.bp b/automotive/audiocontrol/aidl/default/Android.bp index 7694bdf160..1439cce606 100644 --- a/automotive/audiocontrol/aidl/default/Android.bp +++ b/automotive/audiocontrol/aidl/default/Android.bp @@ -29,8 +29,8 @@ cc_binary { vendor: true, shared_libs: [ "android.hardware.audio.common@7.0-enums", - "android.frameworks.automotive.powerpolicy-V1-ndk_platform", - "android.hardware.automotive.audiocontrol-V1-ndk_platform", + "android.frameworks.automotive.powerpolicy-V1-ndk", + "android.hardware.automotive.audiocontrol-V1-ndk", "libbase", "libbinder_ndk", "libcutils", diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp index bd9e9b6049..f96654f056 100644 --- a/automotive/vehicle/2.0/default/Android.bp +++ b/automotive/vehicle/2.0/default/Android.bp @@ -41,7 +41,7 @@ cc_defaults { defaults: ["vhal_v2_0_defaults"], shared_libs: [ "libbinder_ndk", - "android.automotive.watchdog-V2-ndk_platform", + "android.automotive.watchdog-V2-ndk", ], } @@ -177,11 +177,11 @@ cc_test { // Exclude share libraries from default because they might be missing on // some test platforms and we are using static libraries instead. exclude_shared_libs: [ - "android.automotive.watchdog-V2-ndk_platform", + "android.automotive.watchdog-V2-ndk", "android.hardware.automotive.vehicle@2.0", ], static_libs: [ - "android.automotive.watchdog-V2-ndk_platform", + "android.automotive.watchdog-V2-ndk", "android.hardware.automotive.vehicle@2.0", ], header_libs: ["libbase_headers"], @@ -206,11 +206,11 @@ cc_test { // Exclude share libraries from default because they might be missing on // some test platforms and we are using static libraries instead. exclude_shared_libs: [ - "android.automotive.watchdog-V2-ndk_platform", + "android.automotive.watchdog-V2-ndk", "android.hardware.automotive.vehicle@2.0", ], whole_static_libs: [ - "android.automotive.watchdog-V2-ndk_platform", + "android.automotive.watchdog-V2-ndk", "android.hardware.automotive.vehicle@2.0", "android.hardware.automotive.vehicle@2.0-default-impl-lib", "android.hardware.automotive.vehicle@2.0-libproto-native", diff --git a/biometrics/face/aidl/default/Android.bp b/biometrics/face/aidl/default/Android.bp index d72411e6e2..509231859d 100644 --- a/biometrics/face/aidl/default/Android.bp +++ b/biometrics/face/aidl/default/Android.bp @@ -16,8 +16,8 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.biometrics.face-V1-ndk_platform", - "android.hardware.biometrics.common-V1-ndk_platform", + "android.hardware.biometrics.face-V1-ndk", + "android.hardware.biometrics.common-V1-ndk", ], srcs: [ "main.cpp", diff --git a/biometrics/face/aidl/vts/Android.bp b/biometrics/face/aidl/vts/Android.bp index 99c8c99488..09ec4d06e3 100644 --- a/biometrics/face/aidl/vts/Android.bp +++ b/biometrics/face/aidl/vts/Android.bp @@ -15,10 +15,10 @@ cc_test { ], srcs: ["VtsHalBiometricsFaceTargetTest.cpp"], static_libs: [ - "android.hardware.biometrics.common-V1-ndk_platform", - "android.hardware.biometrics.face-V1-ndk_platform", - "android.hardware.common-V2-ndk_platform", - "android.hardware.keymaster-V3-ndk_platform", + "android.hardware.biometrics.common-V1-ndk", + "android.hardware.biometrics.face-V1-ndk", + "android.hardware.common-V2-ndk", + "android.hardware.keymaster-V3-ndk", ], shared_libs: [ "libbinder_ndk", diff --git a/biometrics/fingerprint/aidl/default/Android.bp b/biometrics/fingerprint/aidl/default/Android.bp index 80e6e02cf1..08fe4b04b7 100644 --- a/biometrics/fingerprint/aidl/default/Android.bp +++ b/biometrics/fingerprint/aidl/default/Android.bp @@ -24,8 +24,8 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.biometrics.fingerprint-V1-ndk_platform", - "android.hardware.biometrics.common-V1-ndk_platform", + "android.hardware.biometrics.fingerprint-V1-ndk", + "android.hardware.biometrics.common-V1-ndk", ], } diff --git a/biometrics/fingerprint/aidl/vts/Android.bp b/biometrics/fingerprint/aidl/vts/Android.bp index 5539548856..30d5624144 100644 --- a/biometrics/fingerprint/aidl/vts/Android.bp +++ b/biometrics/fingerprint/aidl/vts/Android.bp @@ -15,9 +15,9 @@ cc_test { ], srcs: ["VtsHalBiometricsFingerprintTargetTest.cpp"], static_libs: [ - "android.hardware.biometrics.common-V1-ndk_platform", - "android.hardware.biometrics.fingerprint-V1-ndk_platform", - "android.hardware.keymaster-V3-ndk_platform", + "android.hardware.biometrics.common-V1-ndk", + "android.hardware.biometrics.fingerprint-V1-ndk", + "android.hardware.keymaster-V3-ndk", ], shared_libs: [ "libbinder_ndk", diff --git a/gnss/1.1/default/Android.bp b/gnss/1.1/default/Android.bp index ab87990ed1..3c9c29a7d6 100644 --- a/gnss/1.1/default/Android.bp +++ b/gnss/1.1/default/Android.bp @@ -27,7 +27,7 @@ cc_binary { "android.hardware.gnss@2.0", "android.hardware.gnss@1.1", "android.hardware.gnss@1.0", - "android.hardware.gnss-V1-ndk_platform", + "android.hardware.gnss-V1-ndk", ], static_libs: [ "android.hardware.gnss@common-default-lib", diff --git a/gnss/2.0/default/Android.bp b/gnss/2.0/default/Android.bp index 8ae9f956c4..695246ad53 100644 --- a/gnss/2.0/default/Android.bp +++ b/gnss/2.0/default/Android.bp @@ -50,7 +50,7 @@ cc_binary { "android.hardware.gnss@2.0", "android.hardware.gnss@1.1", "android.hardware.gnss@1.0", - "android.hardware.gnss-V1-ndk_platform", + "android.hardware.gnss-V1-ndk", ], static_libs: [ "android.hardware.gnss@common-default-lib", diff --git a/gnss/2.1/default/Android.bp b/gnss/2.1/default/Android.bp index 609f59e60f..c46c73545c 100644 --- a/gnss/2.1/default/Android.bp +++ b/gnss/2.1/default/Android.bp @@ -44,7 +44,7 @@ cc_binary { "android.hardware.gnss@1.0", "android.hardware.gnss@1.1", "android.hardware.gnss@2.0", - "android.hardware.gnss-V1-ndk_platform", + "android.hardware.gnss-V1-ndk", ], static_libs: [ "android.hardware.gnss@common-default-lib", diff --git a/gnss/aidl/default/Android.bp b/gnss/aidl/default/Android.bp index 4cc2b6e251..c028dd764e 100644 --- a/gnss/aidl/default/Android.bp +++ b/gnss/aidl/default/Android.bp @@ -52,7 +52,7 @@ cc_binary { "android.hardware.gnss.measurement_corrections@1.1", "android.hardware.gnss.measurement_corrections@1.0", "android.hardware.gnss.visibility_control@1.0", - "android.hardware.gnss-V1-ndk_platform", + "android.hardware.gnss-V1-ndk", ], srcs: [ "Gnss.cpp", diff --git a/gnss/common/utils/default/Android.bp b/gnss/common/utils/default/Android.bp index f9225c24d0..ac94cc1bc0 100644 --- a/gnss/common/utils/default/Android.bp +++ b/gnss/common/utils/default/Android.bp @@ -53,6 +53,6 @@ cc_library_static { "android.hardware.gnss@2.1", "android.hardware.gnss.measurement_corrections@1.1", "android.hardware.gnss.measurement_corrections@1.0", - "android.hardware.gnss-V1-ndk_platform", + "android.hardware.gnss-V1-ndk", ], } diff --git a/power/aidl/default/Android.bp b/power/aidl/default/Android.bp index c0ba9a079c..e10d329cd5 100644 --- a/power/aidl/default/Android.bp +++ b/power/aidl/default/Android.bp @@ -30,7 +30,7 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.power-V2-ndk_platform", + "android.hardware.power-V2-ndk", ], srcs: [ "main.cpp", diff --git a/power/aidl/vts/Android.bp b/power/aidl/vts/Android.bp index 3036b8202d..eccd872716 100644 --- a/power/aidl/vts/Android.bp +++ b/power/aidl/vts/Android.bp @@ -32,7 +32,7 @@ cc_test { "libbinder_ndk", ], static_libs: [ - "android.hardware.power-V2-ndk_platform", + "android.hardware.power-V2-ndk", ], test_suites: [ "vts", diff --git a/tests/extension/vibrator/aidl/client/Android.bp b/tests/extension/vibrator/aidl/client/Android.bp index afab263b82..284ac7459b 100644 --- a/tests/extension/vibrator/aidl/client/Android.bp +++ b/tests/extension/vibrator/aidl/client/Android.bp @@ -27,7 +27,7 @@ cc_test { "android.hardware.tests.extension.vibrator-V1-cpp", "libbinder_ndk", - "android.hardware.vibrator-V2-ndk_platform", - "android.hardware.tests.extension.vibrator-V1-ndk_platform", + "android.hardware.vibrator-V2-ndk", + "android.hardware.tests.extension.vibrator-V1-ndk", ], } diff --git a/tests/extension/vibrator/aidl/default/Android.bp b/tests/extension/vibrator/aidl/default/Android.bp index a200292330..0f3895f8de 100644 --- a/tests/extension/vibrator/aidl/default/Android.bp +++ b/tests/extension/vibrator/aidl/default/Android.bp @@ -28,7 +28,7 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.vibrator-V2-ndk_platform", - "android.hardware.tests.extension.vibrator-V2-ndk_platform", + "android.hardware.vibrator-V2-ndk", + "android.hardware.tests.extension.vibrator-V2-ndk", ], } diff --git a/tv/tuner/aidl/default/Android.bp b/tv/tuner/aidl/default/Android.bp index ba4af445e6..cb8f87b61e 100644 --- a/tv/tuner/aidl/default/Android.bp +++ b/tv/tuner/aidl/default/Android.bp @@ -29,8 +29,8 @@ cc_binary { "libaidlcommonsupport", ], shared_libs: [ - "android.hardware.common.fmq-V1-ndk_platform", - "android.hardware.tv.tuner-V1-ndk_platform", + "android.hardware.common.fmq-V1-ndk", + "android.hardware.tv.tuner-V1-ndk", "libbase", "libbinder_ndk", "libcutils", diff --git a/tv/tuner/aidl/vts/functional/Android.bp b/tv/tuner/aidl/vts/functional/Android.bp index 119230ee3e..e5fb1e6b22 100644 --- a/tv/tuner/aidl/vts/functional/Android.bp +++ b/tv/tuner/aidl/vts/functional/Android.bp @@ -51,9 +51,9 @@ cc_test { "android.hardware.cas@1.0", "android.hardware.cas@1.1", "android.hardware.cas@1.2", - "android.hardware.common-V2-ndk_platform", - "android.hardware.common.fmq-V1-ndk_platform", - "android.hardware.tv.tuner-V1-ndk_platform", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", + "android.hardware.tv.tuner-V1-ndk", "libaidlcommonsupport", "libfmq", "libcutils", diff --git a/vibrator/aidl/default/Android.bp b/vibrator/aidl/default/Android.bp index d463f51511..5a65e759f0 100644 --- a/vibrator/aidl/default/Android.bp +++ b/vibrator/aidl/default/Android.bp @@ -13,7 +13,7 @@ cc_library_static { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.vibrator-V2-ndk_platform", + "android.hardware.vibrator-V2-ndk", ], export_include_dirs: ["include"], srcs: [ @@ -35,7 +35,7 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.vibrator-V2-ndk_platform", + "android.hardware.vibrator-V2-ndk", ], static_libs: [ "libvibratorexampleimpl",