Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: Ibac910e90b1b663ad3237c65c66b98c8dd8d7f06
diff --git a/media/libaudioclient/fuzzer/Android.bp b/media/libaudioclient/fuzzer/Android.bp
index edfc5a5..a8eb385 100644
--- a/media/libaudioclient/fuzzer/Android.bp
+++ b/media/libaudioclient/fuzzer/Android.bp
@@ -21,7 +21,7 @@
],
static_libs: [
"android.hardware.audio.common@7.0-enums",
- "effect-aidl-unstable-cpp",
+ "effect-aidl-cpp",
"libaudioclient",
"libbase",
"libcgrouprc",
@@ -33,16 +33,16 @@
"libmediametricsservice",
"libmedia_helper",
"libprocessgroup",
- "shared-file-region-aidl-unstable-cpp",
+ "shared-file-region-aidl-cpp",
],
shared_libs: [
"android.hardware.audio.common-util",
- "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",
"libaudioflinger",
"libaudiofoundation",
@@ -55,7 +55,7 @@
"libnblog",
"libutils",
"libxml2",
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
],
header_libs: [
"libaudiofoundation_headers",
diff --git a/media/libmediametrics/Android.bp b/media/libmediametrics/Android.bp
index 3dfd850..06e67ad 100644
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@@ -16,7 +16,7 @@
"libcutils",
"liblog",
"libutils",
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
],
export_include_dirs: ["include"],
diff --git a/services/mediametrics/Android.bp b/services/mediametrics/Android.bp
index b64f726..8e1a88b 100644
--- a/services/mediametrics/Android.bp
+++ b/services/mediametrics/Android.bp
@@ -100,7 +100,7 @@
"libmediametricsservice",
"libmediautils",
"libutils",
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
],
header_libs: [
"libaudioutils_headers",
@@ -143,7 +143,7 @@
},
shared_libs: [
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
"libbase", // android logging
"libbinder",
"libcutils",
diff --git a/services/mediametrics/fuzzer/Android.bp b/services/mediametrics/fuzzer/Android.bp
index 6ac9d20..19ed919 100644
--- a/services/mediametrics/fuzzer/Android.bp
+++ b/services/mediametrics/fuzzer/Android.bp
@@ -43,7 +43,7 @@
"libstagefright",
"libstatslog",
"libutils",
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
],
include_dirs: [
diff --git a/services/mediametrics/tests/Android.bp b/services/mediametrics/tests/Android.bp
index 94112b0..e9d91c2 100644
--- a/services/mediametrics/tests/Android.bp
+++ b/services/mediametrics/tests/Android.bp
@@ -19,7 +19,7 @@
"libmediametricsservice",
"libmediautils",
"libutils",
- "mediametricsservice-aidl-unstable-cpp",
+ "mediametricsservice-aidl-cpp",
],
header_libs: [