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
diff --git a/automotive/audiocontrol/aidl/default/Android.bp b/automotive/audiocontrol/aidl/default/Android.bp
index 7694bdf..1439cce 100644
--- a/automotive/audiocontrol/aidl/default/Android.bp
+++ b/automotive/audiocontrol/aidl/default/Android.bp
@@ -29,8 +29,8 @@
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 bd9e9b6..f96654f 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -41,7 +41,7 @@
defaults: ["vhal_v2_0_defaults"],
shared_libs: [
"libbinder_ndk",
- "android.automotive.watchdog-V2-ndk_platform",
+ "android.automotive.watchdog-V2-ndk",
],
}
@@ -177,11 +177,11 @@
// 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 @@
// 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",