From 672b1349c86f4ae024e71587fc05bf8af046a53d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 4 Aug 2021 12:48:04 +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: I674244ff9b873d3779d3d649822389ad441fa0af --- media/jni/Android.bp | 4 ++-- services/core/jni/Android.bp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media/jni/Android.bp b/media/jni/Android.bp index bc73f6ad1ad2a..c775b6f7afc20 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 ab4f1f6fee2f0..8c933773f1fdb 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -157,12 +157,12 @@ cc_defaults { "android.hardware.input.classifier@1.0", "android.hardware.ir@1.0", "android.hardware.light@2.0", - "android.hardware.memtrack-V1-ndk_platform", + "android.hardware.memtrack-V1-ndk", "android.hardware.power@1.0", "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", @@ -175,7 +175,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@1.0",