Specify version for aidl_interface explicitly

Bug: 150578172
Test: m
Change-Id: Ie7605c203c0f0eaf2c40f1e64ea45634b3aa54a5
Merged-In: I141de8ed6958fe42f727a0fa41473de4c1fb38de
This commit is contained in:
Jeongik Cha 2021-01-26 22:34:55 +09:00
parent df543ea006
commit 1674c1354e
32 changed files with 47 additions and 47 deletions

View file

@ -25,7 +25,7 @@ cc_binary {
"AuthSecret.cpp",
],
shared_libs: [
"android.hardware.authsecret-ndk_platform",
"android.hardware.authsecret-V1-ndk_platform",
"libbase",
"libbinder_ndk",
],

View file

@ -21,7 +21,7 @@ cc_test {
"use_libaidlvintf_gtest_helper_static",
],
srcs: ["VtsHalAuthSecretTargetTest.cpp"],
static_libs: ["android.hardware.authsecret-ndk_platform"],
static_libs: ["android.hardware.authsecret-V1-ndk_platform"],
shared_libs: ["libbinder_ndk"],
test_suites: [
"general-tests",

View file

@ -27,6 +27,6 @@ cc_binary {
"libbase",
"libbinder_ndk",
"libutils",
"android.hardware.automotive.occupant_awareness-ndk_platform",
"android.hardware.automotive.occupant_awareness-V1-ndk_platform",
],
}

View file

@ -27,6 +27,6 @@ cc_binary {
"libbase",
"libbinder_ndk",
"libutils",
"android.hardware.automotive.occupant_awareness-ndk_platform",
"android.hardware.automotive.occupant_awareness-V1-ndk_platform",
],
}

View file

@ -9,7 +9,7 @@ cc_test {
"libbinder",
],
static_libs: [
"android.hardware.automotive.occupant_awareness-cpp",
"android.hardware.automotive.occupant_awareness-V1-cpp",
],
test_suites: [
"vts",

View file

@ -32,7 +32,7 @@ cc_defaults {
defaults: ["vhal_v2_0_defaults"],
shared_libs: [
"libbinder_ndk",
"carwatchdog_aidl_interface-ndk_platform",
"carwatchdog_aidl_interface-V2-ndk_platform",
],
}

View file

@ -19,7 +19,7 @@ cc_test {
defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalGraphicsMapperV4_0TargetTest.cpp"],
static_libs: [
"android.hardware.graphics.common-unstable-ndk_platform",
"android.hardware.graphics.common-V2-ndk_platform",
"android.hardware.graphics.mapper@4.0-vts",
"libgralloctypes",
"libsync",

View file

@ -20,7 +20,7 @@ cc_defaults {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.health.storage-unstable-ndk_platform",
"android.hardware.health.storage-V1-ndk_platform",
],
static_libs: [
"libfstab",

View file

@ -25,7 +25,7 @@ cc_test {
"libbinder_ndk",
],
static_libs: [
"android.hardware.health.storage-ndk_platform",
"android.hardware.health.storage-V1-ndk_platform",
],
header_libs: [
"libhealth_storage_test_common_headers",

View file

@ -29,8 +29,8 @@ cc_library_static {
"libsoft_attestation_cert",
"libpuresoftkeymasterdevice",
"android.hardware.identity-support-lib",
"android.hardware.identity-unstable-ndk_platform",
"android.hardware.keymaster-unstable-ndk_platform",
"android.hardware.identity-V3-ndk_platform",
"android.hardware.keymaster-V3-ndk_platform",
],
}
@ -89,8 +89,8 @@ cc_binary {
"libsoft_attestation_cert",
"libpuresoftkeymasterdevice",
"android.hardware.identity-support-lib",
"android.hardware.identity-unstable-ndk_platform",
"android.hardware.keymaster-unstable-ndk_platform",
"android.hardware.identity-V3-ndk_platform",
"android.hardware.keymaster-V3-ndk_platform",
"android.hardware.identity-libeic-hal-common",
"android.hardware.identity-libeic-library",
],

View file

@ -30,9 +30,9 @@ cc_test {
"libpuresoftkeymasterdevice",
"android.hardware.keymaster@4.0",
"android.hardware.identity-support-lib",
"android.hardware.identity-unstable-cpp",
"android.hardware.keymaster-unstable-cpp",
"android.hardware.keymaster-unstable-ndk_platform",
"android.hardware.identity-V3-cpp",
"android.hardware.keymaster-V3-cpp",
"android.hardware.keymaster-V3-ndk_platform",
"libkeymaster4support",
"libkeymaster4_1support",
],

View file

@ -7,7 +7,7 @@ cc_binary {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.light-ndk_platform",
"android.hardware.light-V1-ndk_platform",
],
srcs: [
"Lights.cpp",

View file

@ -27,7 +27,7 @@ cc_test {
"libbinder",
],
static_libs: [
"android.hardware.light-cpp",
"android.hardware.light-V1-cpp",
],
test_suites: [
"vts",

View file

@ -28,6 +28,6 @@ cc_binary {
"libutils",
],
static_libs: [
"android.hardware.light-cpp",
"android.hardware.light-V1-cpp",
],
}

View file

@ -21,7 +21,7 @@ cc_binary {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.memtrack-ndk_platform",
"android.hardware.memtrack-V1-ndk_platform",
],
srcs: [
"main.cpp",

View file

@ -10,7 +10,7 @@ cc_test {
"libvintf",
],
static_libs: [
"android.hardware.memtrack-unstable-ndk_platform",
"android.hardware.memtrack-V1-ndk_platform",
],
test_suites: [
"vts-core",

View file

@ -25,7 +25,7 @@ cc_binary {
"OemLock.cpp",
],
shared_libs: [
"android.hardware.oemlock-ndk_platform",
"android.hardware.oemlock-V1-ndk_platform",
"libbase",
"libbinder_ndk",
],

View file

@ -25,7 +25,7 @@ cc_test {
"libbinder_ndk",
"libbase",
],
static_libs: ["android.hardware.oemlock-ndk_platform"],
static_libs: ["android.hardware.oemlock-V1-ndk_platform"],
test_suites: [
"general-tests",
"vts",

View file

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

View file

@ -23,7 +23,7 @@ cc_test {
"libbinder",
],
static_libs: [
"android.hardware.power-cpp",
"android.hardware.power-V1-cpp",
],
test_suites: [
"vts",

View file

@ -20,7 +20,7 @@ cc_library_static {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.rebootescrow-ndk_platform",
"android.hardware.rebootescrow-V1-ndk_platform",
],
export_include_dirs: ["include"],
srcs: [
@ -47,7 +47,7 @@ cc_binary {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.rebootescrow-ndk_platform",
"android.hardware.rebootescrow-V1-ndk_platform",
],
static_libs: [
"libhadamardutils",

View file

@ -25,7 +25,7 @@ cc_test {
"libbinder",
],
static_libs: [
"android.hardware.rebootescrow-cpp",
"android.hardware.rebootescrow-V1-cpp",
],
test_suites: [
"vts",

View file

@ -9,7 +9,7 @@ cc_binary {
"-Wextra",
],
shared_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"libbase",
"libbinder_ndk",
"libcppbor",

View file

@ -30,8 +30,8 @@ cc_test {
"libkeymint_support",
],
static_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.secureclock-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.secureclock-V1-ndk_platform",
"libcppbor_external",
"libkeymint_vts_test_utils",
],
@ -60,8 +60,8 @@ cc_test_library {
"libkeymint_support",
],
static_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.secureclock-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.secureclock-V1-ndk_platform",
"libcppbor",
],
}

View file

@ -31,7 +31,7 @@ cc_library {
"include",
],
shared_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"libbase",
"libcrypto",
"libutils",

View file

@ -14,11 +14,11 @@ cc_test {
shared_libs: [
"libbinder",
"libutils",
"android.hardware.vibrator-cpp",
"android.hardware.tests.extension.vibrator-cpp",
"android.hardware.vibrator-V1-cpp",
"android.hardware.tests.extension.vibrator-V1-cpp",
"libbinder_ndk",
"android.hardware.vibrator-ndk_platform",
"android.hardware.tests.extension.vibrator-ndk_platform",
"android.hardware.vibrator-V1-ndk_platform",
"android.hardware.tests.extension.vibrator-V1-ndk_platform",
],
}

View file

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

View file

@ -91,8 +91,8 @@ cc_test {
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: [
"android.hardware.common-unstable-ndk_platform",
"android.hardware.common.fmq-unstable-ndk_platform",
"android.hardware.common-V2-ndk_platform",
"android.hardware.common.fmq-V1-ndk_platform",
"android.hardware.tests.msgq@1.0",
"android.fmq.test-ndk_platform",
],

View file

@ -4,7 +4,7 @@ cc_library_static {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.vibrator-ndk_platform",
"android.hardware.vibrator-V1-ndk_platform",
],
export_include_dirs: ["include"],
srcs: ["Vibrator.cpp"],
@ -23,7 +23,7 @@ cc_binary {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.vibrator-ndk_platform",
"android.hardware.vibrator-V1-ndk_platform",
],
static_libs: [
"libvibratorexampleimpl",

View file

@ -9,7 +9,7 @@ cc_test {
"libbinder",
],
static_libs: [
"android.hardware.vibrator-cpp",
"android.hardware.vibrator-V1-cpp",
],
test_suites: [
"general-tests",

View file

@ -25,7 +25,7 @@ cc_binary {
"Weaver.cpp",
],
shared_libs: [
"android.hardware.weaver-ndk_platform",
"android.hardware.weaver-V1-ndk_platform",
"libbase",
"libbinder_ndk",
],

View file

@ -25,7 +25,7 @@ cc_test {
"libbinder_ndk",
"libbase",
],
static_libs: ["android.hardware.weaver-ndk_platform"],
static_libs: ["android.hardware.weaver-V1-ndk_platform"],
test_suites: [
"general-tests",
"vts",