tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove ndk_platform backend. Use the ndk backend."

Browse source
This commit is contained in:
Jiyong Park 2021-08-05 13:51:02 +00:00 committed by Android (Google) Code Review
commit 1519b41bdd
18 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
automotive/audiocontrol/aidl/default/Android.bp
View file

@ -29,8 +29,8 @@ cc_binary {
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"android.hardware.audio.common@7.0-enums", "android.hardware.audio.common@7.0-enums",
"android.frameworks.automotive.powerpolicy-V1-ndk_platform", "android.frameworks.automotive.powerpolicy-V1-ndk",
"android.hardware.automotive.audiocontrol-V1-ndk_platform", "android.hardware.automotive.audiocontrol-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcutils", "libcutils",

10
automotive/vehicle/2.0/default/Android.bp
View file

@ -41,7 +41,7 @@ cc_defaults {
defaults: ["vhal_v2_0_defaults"], defaults: ["vhal_v2_0_defaults"],
shared_libs: [ shared_libs: [
"libbinder_ndk", "libbinder_ndk",
"android.automotive.watchdog-V2-ndk_platform", "android.automotive.watchdog-V2-ndk",
], ],
} }
@ -177,11 +177,11 @@ cc_test {
// Exclude share libraries from default because they might be missing on // Exclude share libraries from default because they might be missing on
// some test platforms and we are using static libraries instead. // some test platforms and we are using static libraries instead.
exclude_shared_libs: [ exclude_shared_libs: [
"android.automotive.watchdog-V2-ndk_platform", "android.automotive.watchdog-V2-ndk",
"android.hardware.automotive.vehicle@2.0", "android.hardware.automotive.vehicle@2.0",
], ],
static_libs: [ 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",
], ],
header_libs: ["libbase_headers"], header_libs: ["libbase_headers"],
@ -206,11 +206,11 @@ cc_test {
// Exclude share libraries from default because they might be missing on // Exclude share libraries from default because they might be missing on
// some test platforms and we are using static libraries instead. // some test platforms and we are using static libraries instead.
exclude_shared_libs: [ exclude_shared_libs: [
"android.automotive.watchdog-V2-ndk_platform", "android.automotive.watchdog-V2-ndk",
"android.hardware.automotive.vehicle@2.0", "android.hardware.automotive.vehicle@2.0",
], ],
whole_static_libs: [ 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",
"android.hardware.automotive.vehicle@2.0-default-impl-lib", "android.hardware.automotive.vehicle@2.0-default-impl-lib",
"android.hardware.automotive.vehicle@2.0-libproto-native", "android.hardware.automotive.vehicle@2.0-libproto-native",

4
biometrics/face/aidl/default/Android.bp
View file

@ -16,8 +16,8 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.biometrics.face-V1-ndk_platform", "android.hardware.biometrics.face-V1-ndk",
"android.hardware.biometrics.common-V1-ndk_platform", "android.hardware.biometrics.common-V1-ndk",
], ],
srcs: [ srcs: [
"main.cpp", "main.cpp",

8
biometrics/face/aidl/vts/Android.bp
View file

@ -15,10 +15,10 @@ cc_test {
], ],
srcs: ["VtsHalBiometricsFaceTargetTest.cpp"], srcs: ["VtsHalBiometricsFaceTargetTest.cpp"],
static_libs: [ static_libs: [
"android.hardware.biometrics.common-V1-ndk_platform", "android.hardware.biometrics.common-V1-ndk",
"android.hardware.biometrics.face-V1-ndk_platform", "android.hardware.biometrics.face-V1-ndk",
"android.hardware.common-V2-ndk_platform", "android.hardware.common-V2-ndk",
"android.hardware.keymaster-V3-ndk_platform", "android.hardware.keymaster-V3-ndk",
], ],
shared_libs: [ shared_libs: [
"libbinder_ndk", "libbinder_ndk",

4
biometrics/fingerprint/aidl/default/Android.bp
View file

@ -24,8 +24,8 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.biometrics.fingerprint-V1-ndk_platform", "android.hardware.biometrics.fingerprint-V1-ndk",
"android.hardware.biometrics.common-V1-ndk_platform", "android.hardware.biometrics.common-V1-ndk",
], ],
} }

6
biometrics/fingerprint/aidl/vts/Android.bp
View file

@ -15,9 +15,9 @@ cc_test {
], ],
srcs: ["VtsHalBiometricsFingerprintTargetTest.cpp"], srcs: ["VtsHalBiometricsFingerprintTargetTest.cpp"],
static_libs: [ static_libs: [
"android.hardware.biometrics.common-V1-ndk_platform", "android.hardware.biometrics.common-V1-ndk",
"android.hardware.biometrics.fingerprint-V1-ndk_platform", "android.hardware.biometrics.fingerprint-V1-ndk",
"android.hardware.keymaster-V3-ndk_platform", "android.hardware.keymaster-V3-ndk",
], ],
shared_libs: [ shared_libs: [
"libbinder_ndk", "libbinder_ndk",

2
gnss/1.1/default/Android.bp
View file

@ -27,7 +27,7 @@ cc_binary {
"android.hardware.gnss@2.0", "android.hardware.gnss@2.0",
"android.hardware.gnss@1.1", "android.hardware.gnss@1.1",
"android.hardware.gnss@1.0", "android.hardware.gnss@1.0",
"android.hardware.gnss-V1-ndk_platform", "android.hardware.gnss-V1-ndk",
], ],
static_libs: [ static_libs: [
"android.hardware.gnss@common-default-lib", "android.hardware.gnss@common-default-lib",

2
gnss/2.0/default/Android.bp
View file

@ -50,7 +50,7 @@ cc_binary {
"android.hardware.gnss@2.0", "android.hardware.gnss@2.0",
"android.hardware.gnss@1.1", "android.hardware.gnss@1.1",
"android.hardware.gnss@1.0", "android.hardware.gnss@1.0",
"android.hardware.gnss-V1-ndk_platform", "android.hardware.gnss-V1-ndk",
], ],
static_libs: [ static_libs: [
"android.hardware.gnss@common-default-lib", "android.hardware.gnss@common-default-lib",

2
gnss/2.1/default/Android.bp
View file

@ -44,7 +44,7 @@ cc_binary {
"android.hardware.gnss@1.0", "android.hardware.gnss@1.0",
"android.hardware.gnss@1.1", "android.hardware.gnss@1.1",
"android.hardware.gnss@2.0", "android.hardware.gnss@2.0",
"android.hardware.gnss-V1-ndk_platform", "android.hardware.gnss-V1-ndk",
], ],
static_libs: [ static_libs: [
"android.hardware.gnss@common-default-lib", "android.hardware.gnss@common-default-lib",

2
gnss/aidl/default/Android.bp
View file

@ -52,7 +52,7 @@ cc_binary {
"android.hardware.gnss.measurement_corrections@1.1", "android.hardware.gnss.measurement_corrections@1.1",
"android.hardware.gnss.measurement_corrections@1.0", "android.hardware.gnss.measurement_corrections@1.0",
"android.hardware.gnss.visibility_control@1.0", "android.hardware.gnss.visibility_control@1.0",
"android.hardware.gnss-V1-ndk_platform", "android.hardware.gnss-V1-ndk",
], ],
srcs: [ srcs: [
"Gnss.cpp", "Gnss.cpp",

2
gnss/common/utils/default/Android.bp
View file

@ -53,6 +53,6 @@ cc_library_static {
"android.hardware.gnss@2.1", "android.hardware.gnss@2.1",
"android.hardware.gnss.measurement_corrections@1.1", "android.hardware.gnss.measurement_corrections@1.1",
"android.hardware.gnss.measurement_corrections@1.0", "android.hardware.gnss.measurement_corrections@1.0",
"android.hardware.gnss-V1-ndk_platform", "android.hardware.gnss-V1-ndk",
], ],
} }

2
power/aidl/default/Android.bp
View file

@ -30,7 +30,7 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.power-V2-ndk_platform", "android.hardware.power-V2-ndk",
], ],
srcs: [ srcs: [
"main.cpp", "main.cpp",

2
power/aidl/vts/Android.bp
View file

@ -32,7 +32,7 @@ cc_test {
"libbinder_ndk", "libbinder_ndk",
], ],
static_libs: [ static_libs: [
"android.hardware.power-V2-ndk_platform", "android.hardware.power-V2-ndk",
], ],
test_suites: [ test_suites: [
"vts", "vts",

4
tests/extension/vibrator/aidl/client/Android.bp
View file

@ -27,7 +27,7 @@ cc_test {
"android.hardware.tests.extension.vibrator-V1-cpp", "android.hardware.tests.extension.vibrator-V1-cpp",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.vibrator-V2-ndk_platform", "android.hardware.vibrator-V2-ndk",
"android.hardware.tests.extension.vibrator-V1-ndk_platform", "android.hardware.tests.extension.vibrator-V1-ndk",
], ],
} }

4
tests/extension/vibrator/aidl/default/Android.bp
View file

@ -28,7 +28,7 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.vibrator-V2-ndk_platform", "android.hardware.vibrator-V2-ndk",
"android.hardware.tests.extension.vibrator-V2-ndk_platform", "android.hardware.tests.extension.vibrator-V2-ndk",
], ],
} }

4
tv/tuner/aidl/default/Android.bp
View file

@ -29,8 +29,8 @@ cc_binary {
"libaidlcommonsupport", "libaidlcommonsupport",
], ],
shared_libs: [ shared_libs: [
"android.hardware.common.fmq-V1-ndk_platform", "android.hardware.common.fmq-V1-ndk",
"android.hardware.tv.tuner-V1-ndk_platform", "android.hardware.tv.tuner-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcutils", "libcutils",

6
tv/tuner/aidl/vts/functional/Android.bp
View file

@ -51,9 +51,9 @@ cc_test {
"android.hardware.cas@1.0", "android.hardware.cas@1.0",
"android.hardware.cas@1.1", "android.hardware.cas@1.1",
"android.hardware.cas@1.2", "android.hardware.cas@1.2",
"android.hardware.common-V2-ndk_platform", "android.hardware.common-V2-ndk",
"android.hardware.common.fmq-V1-ndk_platform", "android.hardware.common.fmq-V1-ndk",
"android.hardware.tv.tuner-V1-ndk_platform", "android.hardware.tv.tuner-V1-ndk",
"libaidlcommonsupport", "libaidlcommonsupport",
"libfmq", "libfmq",
"libcutils", "libcutils",

4
vibrator/aidl/default/Android.bp
View file

@ -13,7 +13,7 @@ cc_library_static {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.vibrator-V2-ndk_platform", "android.hardware.vibrator-V2-ndk",
], ],
export_include_dirs: ["include"], export_include_dirs: ["include"],
srcs: [ srcs: [
@ -35,7 +35,7 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"android.hardware.vibrator-V2-ndk_platform", "android.hardware.vibrator-V2-ndk",
], ],
static_libs: [ static_libs: [
"libvibratorexampleimpl", "libvibratorexampleimpl",