Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.
Test: mma
Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp
index debed27..ddd286c 100644
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.audio@2.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
srcs: [
"types.hal",
"IDevice.hal",
@@ -29,7 +29,7 @@
genrule {
name: "android.hardware.audio@2.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
srcs: [
"types.hal",
"IDevice.hal",
@@ -93,6 +93,7 @@
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
@@ -100,5 +101,6 @@
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
}
diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk
index 8557ea2..31001c0 100644
--- a/audio/2.0/Android.mk
+++ b/audio/2.0/Android.mk
@@ -27,7 +27,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava-constants -randroid.hardware:hardware/interfaces \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.audio@2.0
$(GEN):
diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp
index 88f7921..5d33733 100644
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.audio.common@2.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.common@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
srcs: [
"types.hal",
],
@@ -15,7 +15,7 @@
genrule {
name: "android.hardware.audio.common@2.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.common@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
srcs: [
"types.hal",
],
diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk
index f8346b1..05530a8 100644
--- a/audio/common/2.0/Android.mk
+++ b/audio/common/2.0/Android.mk
@@ -20,7 +20,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava-constants -randroid.hardware:hardware/interfaces \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.audio.common@2.0
$(GEN):
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index 9edbb2a..a094dec 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.audio.effect@2.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.effect@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
srcs: [
"types.hal",
"IAcousticEchoCancelerEffect.hal",
@@ -43,7 +43,7 @@
genrule {
name: "android.hardware.audio.effect@2.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.audio.effect@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
srcs: [
"types.hal",
"IAcousticEchoCancelerEffect.hal",
@@ -149,6 +149,7 @@
"libutils",
"libcutils",
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
@@ -156,5 +157,6 @@
"libhwbinder",
"libutils",
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
}
diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk
index a30de1c..0f4b5d4 100644
--- a/audio/effect/2.0/Android.mk
+++ b/audio/effect/2.0/Android.mk
@@ -34,7 +34,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava-constants -randroid.hardware:hardware/interfaces \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.audio.effect@2.0
$(GEN):