summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2021-08-04 12:48:04 +0900
committer Jiyong Park <jiyong@google.com> 2021-10-25 08:46:24 +0900
commit0c103dcde9f7ec936146d85bf89738804b585188 (patch)
treed0e27da8a51f83670181eb5e25729a8bfc1c5a6b
parente563bef9fd45a7235714e492e3cbdd52755db7b6 (diff)
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: I674244ff9b873d3779d3d649822389ad441fa0af Change-Id: I674244ff9b873d3779d3d649822389ad441fa0af (cherry picked from commit 672b1349c86f4ae024e71587fc05bf8af046a53d)
-rw-r--r--media/jni/Android.bp4
-rw-r--r--services/core/jni/Android.bp4
2 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index bc73f6ad1ad2..c775b6f7afc2 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -183,8 +183,8 @@ cc_library_shared {
"libmedia",
"libnativehelper",
"libutils",
- "tv_tuner_aidl_interface-ndk_platform",
- "tv_tuner_resource_manager_aidl_interface-ndk_platform",
+ "tv_tuner_aidl_interface-ndk",
+ "tv_tuner_resource_manager_aidl_interface-ndk",
],
static_libs: [
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 2722b8d04370..710a304545af 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -165,7 +165,7 @@ cc_defaults {
"android.hardware.power@1.1",
"android.hardware.power-V2-cpp",
"android.hardware.power.stats@1.0",
- "android.hardware.power.stats-V1-ndk_platform",
+ "android.hardware.power.stats-V1-ndk",
"android.hardware.thermal@1.0",
"android.hardware.tv.input@1.0",
"android.hardware.vibrator-V2-cpp",
@@ -178,7 +178,7 @@ cc_defaults {
"android.frameworks.schedulerservice@1.0",
"android.frameworks.sensorservice@1.0",
"android.frameworks.stats@1.0",
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"android.system.suspend.control-V1-cpp",
"android.system.suspend.control.internal-cpp",
"android.system.suspend-V1-ndk",