From 1674c1354e4c191b9da955cd91f028abee359ae3 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Tue, 26 Jan 2021 22:34:55 +0900 Subject: [PATCH] Specify version for aidl_interface explicitly Bug: 150578172 Test: m Change-Id: Ie7605c203c0f0eaf2c40f1e64ea45634b3aa54a5 Merged-In: I141de8ed6958fe42f727a0fa41473de4c1fb38de --- authsecret/aidl/default/Android.bp | 2 +- authsecret/aidl/vts/Android.bp | 2 +- automotive/occupant_awareness/aidl/default/Android.bp | 2 +- automotive/occupant_awareness/aidl/mock/Android.bp | 2 +- .../occupant_awareness/aidl/vts/functional/Android.bp | 2 +- automotive/vehicle/2.0/default/Android.bp | 2 +- graphics/mapper/4.0/vts/functional/Android.bp | 2 +- health/storage/aidl/default/Android.bp | 2 +- health/storage/aidl/vts/functional/Android.bp | 2 +- identity/aidl/default/Android.bp | 8 ++++---- identity/aidl/vts/Android.bp | 6 +++--- light/aidl/default/Android.bp | 2 +- light/aidl/vts/functional/Android.bp | 2 +- light/utils/Android.bp | 2 +- memtrack/aidl/default/Android.bp | 2 +- memtrack/aidl/vts/Android.bp | 2 +- oemlock/aidl/default/Android.bp | 2 +- oemlock/aidl/vts/Android.bp | 2 +- power/aidl/default/Android.bp | 2 +- power/aidl/vts/Android.bp | 2 +- rebootescrow/aidl/default/Android.bp | 4 ++-- rebootescrow/aidl/vts/functional/Android.bp | 2 +- security/keymint/aidl/default/Android.bp | 2 +- security/keymint/aidl/vts/functional/Android.bp | 8 ++++---- security/keymint/support/Android.bp | 2 +- tests/extension/vibrator/aidl/client/Android.bp | 8 ++++---- tests/extension/vibrator/aidl/default/Android.bp | 4 ++-- tests/msgq/1.0/default/Android.bp | 4 ++-- vibrator/aidl/default/Android.bp | 4 ++-- vibrator/aidl/vts/Android.bp | 2 +- weaver/aidl/default/Android.bp | 2 +- weaver/aidl/vts/Android.bp | 2 +- 32 files changed, 47 insertions(+), 47 deletions(-) diff --git a/authsecret/aidl/default/Android.bp b/authsecret/aidl/default/Android.bp index d5983442f5..44e0711096 100644 --- a/authsecret/aidl/default/Android.bp +++ b/authsecret/aidl/default/Android.bp @@ -25,7 +25,7 @@ cc_binary { "AuthSecret.cpp", ], shared_libs: [ - "android.hardware.authsecret-ndk_platform", + "android.hardware.authsecret-V1-ndk_platform", "libbase", "libbinder_ndk", ], diff --git a/authsecret/aidl/vts/Android.bp b/authsecret/aidl/vts/Android.bp index 83a85b26ce..29b3bcc21d 100644 --- a/authsecret/aidl/vts/Android.bp +++ b/authsecret/aidl/vts/Android.bp @@ -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", diff --git a/automotive/occupant_awareness/aidl/default/Android.bp b/automotive/occupant_awareness/aidl/default/Android.bp index 1b2fba2ea4..1e50930716 100644 --- a/automotive/occupant_awareness/aidl/default/Android.bp +++ b/automotive/occupant_awareness/aidl/default/Android.bp @@ -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", ], } diff --git a/automotive/occupant_awareness/aidl/mock/Android.bp b/automotive/occupant_awareness/aidl/mock/Android.bp index 4b3086660c..64ca73377b 100644 --- a/automotive/occupant_awareness/aidl/mock/Android.bp +++ b/automotive/occupant_awareness/aidl/mock/Android.bp @@ -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", ], } diff --git a/automotive/occupant_awareness/aidl/vts/functional/Android.bp b/automotive/occupant_awareness/aidl/vts/functional/Android.bp index 514b0afc2b..dbd0538de1 100644 --- a/automotive/occupant_awareness/aidl/vts/functional/Android.bp +++ b/automotive/occupant_awareness/aidl/vts/functional/Android.bp @@ -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", diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp index 246246c12c..bb64c0bad2 100644 --- a/automotive/vehicle/2.0/default/Android.bp +++ b/automotive/vehicle/2.0/default/Android.bp @@ -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", ], } diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp index 8bda42556b..2d39daaa0b 100644 --- a/graphics/mapper/4.0/vts/functional/Android.bp +++ b/graphics/mapper/4.0/vts/functional/Android.bp @@ -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", diff --git a/health/storage/aidl/default/Android.bp b/health/storage/aidl/default/Android.bp index 68a8ee267f..b53bc35f28 100644 --- a/health/storage/aidl/default/Android.bp +++ b/health/storage/aidl/default/Android.bp @@ -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", diff --git a/health/storage/aidl/vts/functional/Android.bp b/health/storage/aidl/vts/functional/Android.bp index 86b72a712d..0e7671df03 100644 --- a/health/storage/aidl/vts/functional/Android.bp +++ b/health/storage/aidl/vts/functional/Android.bp @@ -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", diff --git a/identity/aidl/default/Android.bp b/identity/aidl/default/Android.bp index 874464849d..9659f576cf 100644 --- a/identity/aidl/default/Android.bp +++ b/identity/aidl/default/Android.bp @@ -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", ], diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp index f1b1bcf552..f487a64799 100644 --- a/identity/aidl/vts/Android.bp +++ b/identity/aidl/vts/Android.bp @@ -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", ], diff --git a/light/aidl/default/Android.bp b/light/aidl/default/Android.bp index ae3f4630de..4e43ba9c63 100644 --- a/light/aidl/default/Android.bp +++ b/light/aidl/default/Android.bp @@ -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", diff --git a/light/aidl/vts/functional/Android.bp b/light/aidl/vts/functional/Android.bp index aa4719b739..4c9356c9ca 100644 --- a/light/aidl/vts/functional/Android.bp +++ b/light/aidl/vts/functional/Android.bp @@ -27,7 +27,7 @@ cc_test { "libbinder", ], static_libs: [ - "android.hardware.light-cpp", + "android.hardware.light-V1-cpp", ], test_suites: [ "vts", diff --git a/light/utils/Android.bp b/light/utils/Android.bp index e901129d1f..871f983532 100644 --- a/light/utils/Android.bp +++ b/light/utils/Android.bp @@ -28,6 +28,6 @@ cc_binary { "libutils", ], static_libs: [ - "android.hardware.light-cpp", + "android.hardware.light-V1-cpp", ], } diff --git a/memtrack/aidl/default/Android.bp b/memtrack/aidl/default/Android.bp index 52f88c8097..8d97bfc703 100644 --- a/memtrack/aidl/default/Android.bp +++ b/memtrack/aidl/default/Android.bp @@ -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", diff --git a/memtrack/aidl/vts/Android.bp b/memtrack/aidl/vts/Android.bp index c9743f43f6..df87db843f 100644 --- a/memtrack/aidl/vts/Android.bp +++ b/memtrack/aidl/vts/Android.bp @@ -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", diff --git a/oemlock/aidl/default/Android.bp b/oemlock/aidl/default/Android.bp index b9872d7eda..464b0a3d60 100644 --- a/oemlock/aidl/default/Android.bp +++ b/oemlock/aidl/default/Android.bp @@ -25,7 +25,7 @@ cc_binary { "OemLock.cpp", ], shared_libs: [ - "android.hardware.oemlock-ndk_platform", + "android.hardware.oemlock-V1-ndk_platform", "libbase", "libbinder_ndk", ], diff --git a/oemlock/aidl/vts/Android.bp b/oemlock/aidl/vts/Android.bp index a13dbe2cc7..18b53c2e7d 100644 --- a/oemlock/aidl/vts/Android.bp +++ b/oemlock/aidl/vts/Android.bp @@ -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", diff --git a/power/aidl/default/Android.bp b/power/aidl/default/Android.bp index 07cd368a54..de04bcdcfc 100644 --- a/power/aidl/default/Android.bp +++ b/power/aidl/default/Android.bp @@ -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", diff --git a/power/aidl/vts/Android.bp b/power/aidl/vts/Android.bp index 28b08c7c4e..008073bdf8 100644 --- a/power/aidl/vts/Android.bp +++ b/power/aidl/vts/Android.bp @@ -23,7 +23,7 @@ cc_test { "libbinder", ], static_libs: [ - "android.hardware.power-cpp", + "android.hardware.power-V1-cpp", ], test_suites: [ "vts", diff --git a/rebootescrow/aidl/default/Android.bp b/rebootescrow/aidl/default/Android.bp index b77272f6d8..e6a4e7ab4f 100644 --- a/rebootescrow/aidl/default/Android.bp +++ b/rebootescrow/aidl/default/Android.bp @@ -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", diff --git a/rebootescrow/aidl/vts/functional/Android.bp b/rebootescrow/aidl/vts/functional/Android.bp index 2cc00685d6..abd4937f62 100644 --- a/rebootescrow/aidl/vts/functional/Android.bp +++ b/rebootescrow/aidl/vts/functional/Android.bp @@ -25,7 +25,7 @@ cc_test { "libbinder", ], static_libs: [ - "android.hardware.rebootescrow-cpp", + "android.hardware.rebootescrow-V1-cpp", ], test_suites: [ "vts", diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp index 79697c4e9e..b2758adcb1 100644 --- a/security/keymint/aidl/default/Android.bp +++ b/security/keymint/aidl/default/Android.bp @@ -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", diff --git a/security/keymint/aidl/vts/functional/Android.bp b/security/keymint/aidl/vts/functional/Android.bp index 17a461366c..f4ba9e7362 100644 --- a/security/keymint/aidl/vts/functional/Android.bp +++ b/security/keymint/aidl/vts/functional/Android.bp @@ -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", ], } diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp index 0cfa798344..fde6b57683 100644 --- a/security/keymint/support/Android.bp +++ b/security/keymint/support/Android.bp @@ -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", diff --git a/tests/extension/vibrator/aidl/client/Android.bp b/tests/extension/vibrator/aidl/client/Android.bp index b0d82382fa..108d000970 100644 --- a/tests/extension/vibrator/aidl/client/Android.bp +++ b/tests/extension/vibrator/aidl/client/Android.bp @@ -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", ], } diff --git a/tests/extension/vibrator/aidl/default/Android.bp b/tests/extension/vibrator/aidl/default/Android.bp index ed40d259ab..fd19f13728 100644 --- a/tests/extension/vibrator/aidl/default/Android.bp +++ b/tests/extension/vibrator/aidl/default/Android.bp @@ -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", ], } diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp index a50206bb75..a0d6f31fd9 100644 --- a/tests/msgq/1.0/default/Android.bp +++ b/tests/msgq/1.0/default/Android.bp @@ -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", ], diff --git a/vibrator/aidl/default/Android.bp b/vibrator/aidl/default/Android.bp index 9e6d9cf2d9..70175dd206 100644 --- a/vibrator/aidl/default/Android.bp +++ b/vibrator/aidl/default/Android.bp @@ -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", diff --git a/vibrator/aidl/vts/Android.bp b/vibrator/aidl/vts/Android.bp index 28cb4d9856..a06dae349c 100644 --- a/vibrator/aidl/vts/Android.bp +++ b/vibrator/aidl/vts/Android.bp @@ -9,7 +9,7 @@ cc_test { "libbinder", ], static_libs: [ - "android.hardware.vibrator-cpp", + "android.hardware.vibrator-V1-cpp", ], test_suites: [ "general-tests", diff --git a/weaver/aidl/default/Android.bp b/weaver/aidl/default/Android.bp index d93682828f..8440670c27 100644 --- a/weaver/aidl/default/Android.bp +++ b/weaver/aidl/default/Android.bp @@ -25,7 +25,7 @@ cc_binary { "Weaver.cpp", ], shared_libs: [ - "android.hardware.weaver-ndk_platform", + "android.hardware.weaver-V1-ndk_platform", "libbase", "libbinder_ndk", ], diff --git a/weaver/aidl/vts/Android.bp b/weaver/aidl/vts/Android.bp index d7e3ab7a6e..7daad8d833 100644 --- a/weaver/aidl/vts/Android.bp +++ b/weaver/aidl/vts/Android.bp @@ -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",