Merge "interfaces: regenerate makefiles" am: d66bb6fb5c am: 502a8ead69

am: 293c94dba5

Change-Id: I67a632587d65880a079f8901ae7addcb7a79e52c
This commit is contained in:
Iliyan Malchev 2016-09-13 05:01:52 +00:00 committed by android-build-merger
commit 2a67c396a3

View file

@ -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
#