interfaces: update makefiles
b/31015466 b/31045569 Change-Id: I07d54fd956fedc4b94622ace1c8f2be3f2f93b2b Signed-off-by: Iliyan Malchev <malchev@google.com>
This commit is contained in:
Iliyan Malchev
parent
c0ba83e30a
commit
b350caf9dc
3 changed files with 126 additions and 102 deletions
|
|
@ -8,6 +8,23 @@ intermediates := $(local-generated-sources-dir)
|
|||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build types.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(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.nfc@1.0::types
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build INfc.hal
|
||||
#
|
||||
|
|
@ -15,6 +32,10 @@ GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp
|
|||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
|
|
@ -32,6 +53,8 @@ GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp
|
|||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
|
|
@ -42,23 +65,6 @@ $(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(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.nfc@1.0::types
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libhidl \
|
||||
|
|
@ -78,40 +84,6 @@ intermediates := $(local-generated-sources-dir)
|
|||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build INfc.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.nfc@1.0::INfc
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/INfc.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build INfcClientCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.nfc@1.0::INfcClientCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (nfc_data_t)
|
||||
#
|
||||
|
|
@ -162,4 +134,44 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
|
|||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build INfc.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.nfc@1.0::INfc
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/INfc.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build INfcClientCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.nfc@1.0::INfcClientCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
include $(BUILD_JAVA_LIBRARY)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,27 @@ intermediates := $(local-generated-sources-dir)
|
|||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build IBaz.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
|
||||
$(GEN): $(LOCAL_PATH)/IBase.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
|
||||
$(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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/IBaz.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBase.hal
|
||||
#
|
||||
|
|
@ -25,23 +46,6 @@ $(GEN): $(LOCAL_PATH)/IBase.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBaz.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/IBaz.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBazCallback.hal
|
||||
#
|
||||
|
|
@ -78,6 +82,27 @@ intermediates := $(local-generated-sources-dir)
|
|||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build IBaz.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
|
||||
$(GEN): $(LOCAL_PATH)/IBase.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
|
||||
$(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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/IBaz.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBase.hal
|
||||
#
|
||||
|
|
@ -95,23 +120,6 @@ $(GEN): $(LOCAL_PATH)/IBase.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBaz.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/IBaz.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IBazCallback.hal
|
||||
#
|
||||
|
|
|
|||
|
|
@ -8,6 +8,23 @@ intermediates := $(local-generated-sources-dir)
|
|||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build types.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IFoo.hal
|
||||
#
|
||||
|
|
@ -15,6 +32,10 @@ GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp
|
|||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IFooCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/IFooCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
|
|
@ -42,23 +63,6 @@ $(GEN): $(LOCAL_PATH)/IFooCallback.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(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
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libhidl \
|
||||
|
|
|
|||
Loading…
Reference in a new issue