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/health/1.0/Android.bp b/health/1.0/Android.bp
index fb92306..f1738bd 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hardware.health@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.health@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
srcs: [
"types.hal",
"IHealth.hal",
@@ -17,7 +17,7 @@
genrule {
name: "android.hardware.health@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.health@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
srcs: [
"types.hal",
"IHealth.hal",
@@ -44,11 +44,13 @@
"liblog",
"libutils",
"libcutils",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
+ "android.hidl.base@1.0",
],
}
diff --git a/health/1.0/Android.mk b/health/1.0/Android.mk
index 776a2c2..4254759 100644
--- a/health/1.0/Android.mk
+++ b/health/1.0/Android.mk
@@ -12,6 +12,10 @@
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java \
+
+
#
# Build types.hal (BatteryHealth)
#
@@ -22,7 +26,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.health@1.0::types.BatteryHealth
$(GEN): $(LOCAL_PATH)/types.hal
@@ -39,7 +45,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.health@1.0::types.BatteryStatus
$(GEN): $(LOCAL_PATH)/types.hal
@@ -56,7 +64,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.health@1.0::types.HealthConfig
$(GEN): $(LOCAL_PATH)/types.hal
@@ -73,7 +83,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.health@1.0::types.HealthInfo
$(GEN): $(LOCAL_PATH)/types.hal
@@ -90,7 +102,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.health@1.0::types.Result
$(GEN): $(LOCAL_PATH)/types.hal
@@ -109,7 +123,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.health@1.0::IHealth
$(GEN): $(LOCAL_PATH)/IHealth.hal
@@ -128,6 +144,10 @@
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java-static \
+
+
#
# Build types.hal (BatteryHealth)
#
@@ -138,7 +158,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.health@1.0::types.BatteryHealth
$(GEN): $(LOCAL_PATH)/types.hal
@@ -155,7 +177,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.health@1.0::types.BatteryStatus
$(GEN): $(LOCAL_PATH)/types.hal
@@ -172,7 +196,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.health@1.0::types.HealthConfig
$(GEN): $(LOCAL_PATH)/types.hal
@@ -189,7 +215,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.health@1.0::types.HealthInfo
$(GEN): $(LOCAL_PATH)/types.hal
@@ -206,7 +234,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.health@1.0::types.Result
$(GEN): $(LOCAL_PATH)/types.hal
@@ -225,7 +255,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.health@1.0::IHealth
$(GEN): $(LOCAL_PATH)/IHealth.hal
@@ -253,7 +285,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.health@1.0
$(GEN):