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: I0652f1efe920111d79dd8c2ecd52e55dda54538f
Change-Id: Ib58c9f1cb80d083a3c62d03415610be855b80f03
(cherry picked from commit c426c6dbdc
)
This commit is contained in:
parent
4e08d0f46b
commit
d55d28a1d0
16 changed files with 27 additions and 27 deletions
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -52,6 +52,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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -32,7 +32,7 @@ cc_test {
|
|||
"libbinder_ndk",
|
||||
],
|
||||
static_libs: [
|
||||
"android.hardware.power-V2-ndk_platform",
|
||||
"android.hardware.power-V2-ndk",
|
||||
],
|
||||
test_suites: [
|
||||
"vts",
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue