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/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index f823570..bc1ccc1 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.graphics.allocator@2.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
srcs: [
"types.hal",
"IAllocator.hal",
@@ -19,7 +19,7 @@
genrule {
name: "android.hardware.graphics.allocator@2.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
srcs: [
"types.hal",
"IAllocator.hal",
@@ -53,6 +53,7 @@
"libutils",
"libcutils",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
@@ -60,5 +61,6 @@
"libhwbinder",
"libutils",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
}
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index 812cf50..b67afd1 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.graphics.common@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.common@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
srcs: [
"types.hal",
],
@@ -15,7 +15,7 @@
genrule {
name: "android.hardware.graphics.common@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.common@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
srcs: [
"types.hal",
],
diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk
index 17b67b6..5049cb3 100644
--- a/graphics/common/1.0/Android.mk
+++ b/graphics/common/1.0/Android.mk
@@ -22,7 +22,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.ColorMode
$(GEN): $(LOCAL_PATH)/types.hal
@@ -39,7 +41,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.ColorTransform
$(GEN): $(LOCAL_PATH)/types.hal
@@ -56,7 +60,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Dataspace
$(GEN): $(LOCAL_PATH)/types.hal
@@ -73,7 +79,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Hdr
$(GEN): $(LOCAL_PATH)/types.hal
@@ -90,7 +98,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.PixelFormat
$(GEN): $(LOCAL_PATH)/types.hal
@@ -107,7 +117,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Transform
$(GEN): $(LOCAL_PATH)/types.hal
@@ -136,7 +148,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.ColorMode
$(GEN): $(LOCAL_PATH)/types.hal
@@ -153,7 +167,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.ColorTransform
$(GEN): $(LOCAL_PATH)/types.hal
@@ -170,7 +186,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Dataspace
$(GEN): $(LOCAL_PATH)/types.hal
@@ -187,7 +205,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Hdr
$(GEN): $(LOCAL_PATH)/types.hal
@@ -204,7 +224,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.PixelFormat
$(GEN): $(LOCAL_PATH)/types.hal
@@ -221,7 +243,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
android.hardware.graphics.common@1.0::types.Transform
$(GEN): $(LOCAL_PATH)/types.hal
@@ -248,7 +272,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.graphics.common@1.0
$(GEN):
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index a2e15f4..2bc8e93 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.graphics.composer@2.1_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.composer@2.1",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
srcs: [
"types.hal",
"IComposer.hal",
@@ -19,7 +19,7 @@
genrule {
name: "android.hardware.graphics.composer@2.1_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.graphics.composer@2.1",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
srcs: [
"types.hal",
"IComposer.hal",
@@ -53,6 +53,7 @@
"libutils",
"libcutils",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
@@ -60,5 +61,6 @@
"libhwbinder",
"libutils",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
}