Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: I730c407461556fcd49a953b4b6249089af740c6e
diff --git a/Android.bp b/Android.bp
index a7cf3e5..944cdc1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,10 +33,10 @@
name: "av-headers",
export_include_dirs: ["include"],
static_libs: [
- "av-types-aidl-unstable-cpp",
+ "av-types-aidl-cpp",
],
export_static_lib_headers: [
- "av-types-aidl-unstable-cpp",
+ "av-types-aidl-cpp",
],
header_libs: [
"libaudioclient_aidl_conversion_util",
diff --git a/media/libaaudio/tests/Android.bp b/media/libaaudio/tests/Android.bp
index 95d6543..85376ad 100644
--- a/media/libaaudio/tests/Android.bp
+++ b/media/libaaudio/tests/Android.bp
@@ -16,7 +16,7 @@
"libbinder",
"libcutils",
"libutils",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
}
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 004ae39..8a575d5 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -14,14 +14,14 @@
"libaudiofoundation_headers",
],
static_libs: [
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "av-types-aidl-unstable-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "av-types-aidl-cpp",
],
export_static_lib_headers: [
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "av-types-aidl-unstable-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "av-types-aidl-cpp",
],
target: {
darwin: {
@@ -40,11 +40,11 @@
"PolicyAidlConversion.cpp"
],
shared_libs: [
- "audioclient-types-aidl-unstable-cpp",
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "audiopolicy-types-aidl-unstable-cpp",
- "capture_state_listener-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "audiopolicy-types-aidl-cpp",
+ "capture_state_listener-aidl-cpp",
"libaudiofoundation",
"libaudioclient_aidl_conversion",
"libaudioutils",
@@ -60,11 +60,11 @@
include_dirs: ["system/media/audio_utils/include"],
export_include_dirs: ["include"],
export_shared_lib_headers: [
- "audioclient-types-aidl-unstable-cpp",
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "audiopolicy-types-aidl-unstable-cpp",
- "capture_state_listener-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "audiopolicy-types-aidl-cpp",
+ "capture_state_listener-aidl-cpp",
"libaudiofoundation",
"libaudioclient_aidl_conversion",
],
@@ -100,12 +100,12 @@
"TrackPlayerBase.cpp",
],
shared_libs: [
- "audioclient-types-aidl-unstable-cpp",
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "audiopolicy-types-aidl-unstable-cpp",
- "av-types-aidl-unstable-cpp",
- "capture_state_listener-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "audiopolicy-types-aidl-cpp",
+ "av-types-aidl-cpp",
+ "capture_state_listener-aidl-cpp",
"libaudioclient_aidl_conversion",
"libaudiofoundation",
"libaudioutils",
@@ -125,8 +125,8 @@
"libvibrator",
],
export_shared_lib_headers: [
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
"libbinder",
],
@@ -144,15 +144,15 @@
],
export_header_lib_headers: ["libaudioclient_headers"],
export_static_lib_headers: [
- "effect-aidl-unstable-cpp",
- "shared-file-region-aidl-unstable-cpp",
+ "effect-aidl-cpp",
+ "shared-file-region-aidl-cpp",
],
static_libs: [
- "effect-aidl-unstable-cpp",
+ "effect-aidl-cpp",
// for memory heap analysis
"libc_malloc_debug_backtrace",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
cflags: [
"-Wall",
@@ -213,18 +213,18 @@
"libaudioclient_aidl_conversion_util",
],
shared_libs: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
"libbase",
"libbinder",
"liblog",
"libshmemcompat",
"libutils",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
export_shared_lib_headers: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
"libbase",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
cflags: [
"-Wall",
diff --git a/media/libaudiofoundation/Android.bp b/media/libaudiofoundation/Android.bp
index 9296d0e..a89d086 100644
--- a/media/libaudiofoundation/Android.bp
+++ b/media/libaudiofoundation/Android.bp
@@ -15,10 +15,10 @@
"libmedia_helper_headers",
],
static_libs: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
],
export_static_lib_headers: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
],
host_supported: true,
target: {
@@ -43,7 +43,7 @@
],
shared_libs: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
"libaudioclient_aidl_conversion",
"libaudioutils",
"libbase",
@@ -54,7 +54,7 @@
],
export_shared_lib_headers: [
- "audioclient-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
"libaudioclient_aidl_conversion",
],
diff --git a/media/libaudiohal/impl/Android.bp b/media/libaudiohal/impl/Android.bp
index fe47881..94e12b8 100644
--- a/media/libaudiohal/impl/Android.bp
+++ b/media/libaudiohal/impl/Android.bp
@@ -26,7 +26,7 @@
"android.hardware.audio.common-util",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
- "av-types-aidl-unstable-cpp",
+ "av-types-aidl-cpp",
"libaudiofoundation",
"libaudiohal_deathhandler",
"libaudioutils",
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index f68f65d..79d6c0b 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -324,8 +324,8 @@
shared_libs: [
"android.hidl.token@1.0-utils",
- "audioclient-types-aidl-unstable-cpp",
- "av-types-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
+ "av-types-aidl-cpp",
"liblog",
"libcutils",
"libprocessgroup",
diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index b62317a..ab6863f 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -15,7 +15,7 @@
shared_libs: [
"android.hardware.media.c2@1.0",
"android.hardware.media.omx@1.0",
- "av-types-aidl-unstable-cpp",
+ "av-types-aidl-cpp",
"libbase",
"libandroid_net",
"libaudioclient",
diff --git a/media/libmediatranscoding/Android.bp b/media/libmediatranscoding/Android.bp
index 23e83f9..e98b7ea 100644
--- a/media/libmediatranscoding/Android.bp
+++ b/media/libmediatranscoding/Android.bp
@@ -96,7 +96,7 @@
static_libs: [
"mediatranscoding_aidl_interface-ndk_platform",
- "resourceobserver_aidl_interface-ndk_platform",
+ "resourceobserver_aidl_interface-V1-ndk_platform",
],
cflags: [
diff --git a/media/libshmem/Android.bp b/media/libshmem/Android.bp
index 62784ed..c715918 100644
--- a/media/libshmem/Android.bp
+++ b/media/libshmem/Android.bp
@@ -21,12 +21,12 @@
"libbinder",
"libshmemutil",
"libutils",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
export_shared_lib_headers: [
"libbinder",
"libutils",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
target: {
darwin: {
@@ -43,10 +43,10 @@
vendor_available: true,
double_loadable: true,
shared_libs: [
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
export_shared_lib_headers: [
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
target: {
darwin: {
@@ -64,7 +64,7 @@
"libshmemcompat",
"libshmemutil",
"libutils",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
test_suites: ["device-tests"],
}
diff --git a/services/audioflinger/Android.bp b/services/audioflinger/Android.bp
index a005250..09d3871 100644
--- a/services/audioflinger/Android.bp
+++ b/services/audioflinger/Android.bp
@@ -35,10 +35,10 @@
],
shared_libs: [
- "audioflinger-aidl-unstable-cpp",
- "audioclient-types-aidl-unstable-cpp",
- "av-types-aidl-unstable-cpp",
- "effect-aidl-unstable-cpp",
+ "audioflinger-aidl-cpp",
+ "audioclient-types-aidl-cpp",
+ "av-types-aidl-cpp",
+ "effect-aidl-cpp",
"libaudioclient_aidl_conversion",
"libaudiofoundation",
"libaudiohal",
diff --git a/services/audiopolicy/service/Android.bp b/services/audiopolicy/service/Android.bp
index 8cb1b59..a05387c 100644
--- a/services/audiopolicy/service/Android.bp
+++ b/services/audiopolicy/service/Android.bp
@@ -30,11 +30,11 @@
"libmediautils",
"libsensorprivacy",
"libutils",
- "audioclient-types-aidl-unstable-cpp",
- "audioflinger-aidl-unstable-cpp",
- "audiopolicy-aidl-unstable-cpp",
- "audiopolicy-types-aidl-unstable-cpp",
- "capture_state_listener-aidl-unstable-cpp",
+ "audioclient-types-aidl-cpp",
+ "audioflinger-aidl-cpp",
+ "audiopolicy-aidl-cpp",
+ "audiopolicy-types-aidl-cpp",
+ "capture_state_listener-aidl-cpp",
],
static_libs: [
diff --git a/services/mediaresourcemanager/Android.bp b/services/mediaresourcemanager/Android.bp
index 83a139b..cb69aa0 100644
--- a/services/mediaresourcemanager/Android.bp
+++ b/services/mediaresourcemanager/Android.bp
@@ -77,7 +77,7 @@
],
static_libs: [
- "resourceobserver_aidl_interface-ndk_platform",
+ "resourceobserver_aidl_interface-V1-ndk_platform",
],
include_dirs: ["frameworks/av/include"],
diff --git a/services/mediaresourcemanager/test/Android.bp b/services/mediaresourcemanager/test/Android.bp
index 308ee91..ad70a35 100644
--- a/services/mediaresourcemanager/test/Android.bp
+++ b/services/mediaresourcemanager/test/Android.bp
@@ -47,7 +47,7 @@
test_suites: ["device-tests"],
static_libs: [
"libresourcemanagerservice",
- "resourceobserver_aidl_interface-ndk_platform",
+ "resourceobserver_aidl_interface-V1-ndk_platform",
],
shared_libs: [
"libbinder",
diff --git a/services/tuner/Android.bp b/services/tuner/Android.bp
index 1cb3037..f432d30 100644
--- a/services/tuner/Android.bp
+++ b/services/tuner/Android.bp
@@ -85,7 +85,7 @@
],
static_libs: [
- "android.hardware.common.fmq-unstable-ndk_platform",
+ "android.hardware.common.fmq-V1-ndk_platform",
"libaidlcommonsupport",
],