Updated indentation to 4 spaces for Android.mk.
Test: `cd system/tools/hidl && mma`
Change-Id: I088893c3c8b080239f0f32e3434faf3da3fefc7a
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index fbf3a35..ef278ae 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.bar@1.0::IBar
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.bar@1.0::IBar
$(GEN): $(LOCAL_PATH)/IBar.hal
$(transform-generated-source)
@@ -27,11 +27,11 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
- android.hardware.tests.foo@1.0 \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
+ android.hardware.tests.foo@1.0 \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index f28709a..56e2ea9 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::types
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::types
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -34,9 +34,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBase
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBase
$(GEN): $(LOCAL_PATH)/IBase.hal
$(transform-generated-source)
@@ -55,9 +55,9 @@
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBaz
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBaz
$(GEN): $(LOCAL_PATH)/IBaz.hal
$(transform-generated-source)
@@ -72,9 +72,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBazCallback
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBazCallback
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(transform-generated-source)
@@ -82,10 +82,10 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
@@ -109,9 +109,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBase
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBase
$(GEN): $(LOCAL_PATH)/IBase.hal
$(transform-generated-source)
@@ -130,9 +130,9 @@
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBaz
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBaz
$(GEN): $(LOCAL_PATH)/IBaz.hal
$(transform-generated-source)
@@ -147,9 +147,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBazCallback
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBazCallback
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(transform-generated-source)
@@ -176,9 +176,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBase
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBase
$(GEN): $(LOCAL_PATH)/IBase.hal
$(transform-generated-source)
@@ -197,9 +197,9 @@
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBaz
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBaz
$(GEN): $(LOCAL_PATH)/IBaz.hal
$(transform-generated-source)
@@ -214,9 +214,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.baz@1.0::IBazCallback
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.baz@1.0::IBazCallback
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(transform-generated-source)
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 21bc08e..804af71 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.expression@1.0::IExpression
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpression
$(GEN): $(LOCAL_PATH)/IExpression.hal
$(transform-generated-source)
@@ -36,9 +36,9 @@
$(GEN): $(LOCAL_PATH)/IExpression.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.expression@1.0::IExpressionExt
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpressionExt
$(GEN): $(LOCAL_PATH)/IExpressionExt.hal
$(transform-generated-source)
@@ -46,10 +46,10 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
@@ -73,9 +73,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.expression@1.0::IExpression
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpression
$(GEN): $(LOCAL_PATH)/IExpression.hal
$(transform-generated-source)
@@ -92,9 +92,9 @@
$(GEN): $(LOCAL_PATH)/IExpression.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.expression@1.0::IExpressionExt
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpressionExt
$(GEN): $(LOCAL_PATH)/IExpressionExt.hal
$(transform-generated-source)
@@ -121,13 +121,32 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.expression@1.0::IExpression
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpression
$(GEN): $(LOCAL_PATH)/IExpression.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IExpressionExt.hal
+#
+GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal
+$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IExpression.hal
+$(GEN): $(LOCAL_PATH)/IExpression.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.expression@1.0::IExpressionExt
+
+$(GEN): $(LOCAL_PATH)/IExpressionExt.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 14eb76b..ee503ef 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.foo@1.0::types
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.foo@1.0::types
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -38,9 +38,9 @@
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.foo@1.0::IFoo
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.foo@1.0::IFoo
$(GEN): $(LOCAL_PATH)/IFoo.hal
$(transform-generated-source)
@@ -55,9 +55,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.foo@1.0::IFooCallback
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.foo@1.0::IFooCallback
$(GEN): $(LOCAL_PATH)/IFooCallback.hal
$(transform-generated-source)
@@ -65,10 +65,10 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index e29b331..61349af 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.libhwbinder@1.0::IBenchmark
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.libhwbinder@1.0::IBenchmark
$(GEN): $(LOCAL_PATH)/IBenchmark.hal
$(transform-generated-source)
@@ -27,10 +27,10 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
@@ -54,9 +54,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.libhwbinder@1.0::IBenchmark
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.libhwbinder@1.0::IBenchmark
$(GEN): $(LOCAL_PATH)/IBenchmark.hal
$(transform-generated-source)
@@ -83,9 +83,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hardware:hardware/interfaces \
- android.hardware.tests.libhwbinder@1.0::IBenchmark
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.libhwbinder@1.0::IBenchmark
$(GEN): $(LOCAL_PATH)/IBenchmark.hal
$(transform-generated-source)
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index 3f97e6c..2cde5bf 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -17,9 +17,9 @@
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ITestMsgQ.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Lc++ -randroid.hardware:hardware/interfaces \
- android.hardware.tests.msgq@1.0::ITestMsgQ
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Lc++ -randroid.hardware:hardware/interfaces \
+ android.hardware.tests.msgq@1.0::ITestMsgQ
$(GEN): $(LOCAL_PATH)/ITestMsgQ.hal
$(transform-generated-source)
@@ -27,10 +27,10 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_SHARED_LIBRARIES := \
- libhidl \
- libhwbinder \
- libutils \
- libcutils \
+ libhidl \
+ libhwbinder \
+ libutils \
+ libcutils \
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)