From c6c7aabdc94210dfccfb95d6886712c91c98abf9 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Fri, 9 Sep 2016 16:24:19 -0700 Subject: [PATCH] interfaces: regenerate makefiles b/31372383 Change-Id: I4fd9d3f174a22f29bc3beb9aeb7c30fc6bd4acd8 Signed-off-by: Iliyan Malchev --- tests/baz/1.0/Android.mk | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk index fdf99c6595..45b1bf536c 100644 --- a/tests/baz/1.0/Android.mk +++ b/tests/baz/1.0/Android.mk @@ -8,6 +8,23 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) +# +# Build IBase.hal +# +GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(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 + +$(GEN): $(LOCAL_PATH)/IBase.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + # # Build IBaz.hal # @@ -29,23 +46,6 @@ $(GEN): $(LOCAL_PATH)/IBaz.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -# -# Build IBase.hal -# -GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(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 - -$(GEN): $(LOCAL_PATH)/IBase.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # # Build IBazCallback.hal # @@ -82,6 +82,23 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) +# +# Build IBase.hal +# +GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(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 + +$(GEN): $(LOCAL_PATH)/IBase.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + # # Build IBaz.hal # @@ -103,23 +120,6 @@ $(GEN): $(LOCAL_PATH)/IBaz.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -# -# Build IBase.hal -# -GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(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 - -$(GEN): $(LOCAL_PATH)/IBase.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # # Build IBazCallback.hal #