summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-10-26 00:31:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-26 00:31:44 +0000
commit27c3bdfeca39eae473c852876c348cc922d4ad4c (patch)
tree3f2dfb3febe8e4d603515fbeeec23031561710d3
parent93336d96396f228a8f9237476fd297ddd38671fe (diff)
parent4ad3a8539cb1380d868131a3e80e68e5b1a72fea (diff)
Merge "Remove ndk_platform backend. Use the ndk backend." am: b4b88809fb am: 4ad3a8539c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1866898 Change-Id: Iab4c0ca4ac19ade4bcc42352a1246a8d683a4162
-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",