Merge "interfaces: regenerate makefiles" am: d66bb6fb5c
am: 502a8ead69
am: 293c94dba5
am: 2a67c396a3
Change-Id: I89afdddfec43173e2605170e07f5540a2e998aca
This commit is contained in:
commit
0aa2e33c05
1 changed files with 34 additions and 34 deletions
|
@ -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
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue