Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b350caf9 authored by Iliyan Malchev's avatar Iliyan Malchev
Browse files

interfaces: update makefiles 



b/31015466
b/31045569

Change-Id: I07d54fd956fedc4b94622ace1c8f2be3f2f93b2b
Signed-off-by: default avatarIliyan Malchev <malchev@google.com>
parent c0ba83e3

nfc/1.0/Android.mk

+50 −38
Original line number Diff line number Diff line
@@ -9,53 +9,59 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build INfc.hal

# Build types.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp

GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal

$(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::INfc

    android.hardware.nfc@1.0::types



$(GEN): $(LOCAL_PATH)/INfc.hal

$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build INfcClientCallback.hal

# Build INfc.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal

$(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) \

    -Lc++ -randroid.hardware:hardware/interfaces \

    android.hardware.nfc@1.0::INfcClientCallback

    android.hardware.nfc@1.0::INfc



$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): $(LOCAL_PATH)/INfc.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal

# Build INfcClientCallback.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(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) \

    -Lc++ -randroid.hardware:hardware/interfaces \

    android.hardware.nfc@1.0::types

    android.hardware.nfc@1.0::INfcClientCallback



$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)
@@ -79,43 +85,43 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build INfc.hal

# Build types.hal (nfc_data_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal

$(GEN): PRIVATE_DEPS := $(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

    android.hardware.nfc@1.0::types.nfc_data_t



$(GEN): $(LOCAL_PATH)/INfc.hal

$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build INfcClientCallback.hal

# Build types.hal (nfc_event_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): PRIVATE_DEPS := $(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

    android.hardware.nfc@1.0::types.nfc_event_t



$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_data_t)

# Build types.hal (nfc_status_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -123,43 +129,49 @@ $(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::types.nfc_data_t

    android.hardware.nfc@1.0::types.nfc_status_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_event_t)

# Build INfc.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(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::types.nfc_event_t

    android.hardware.nfc@1.0::INfc



$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/INfc.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

# Build INfcClientCallback.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(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::types.nfc_status_t

    android.hardware.nfc@1.0::INfcClientCallback



$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)

tests/baz/1.0/Android.mk

+28 −20
Original line number Diff line number Diff line
@@ -9,36 +9,40 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build IBase.hal

# Build IBaz.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp

GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal

$(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::IBase

    android.hardware.tests.baz@1.0::IBaz



$(GEN): $(LOCAL_PATH)/IBase.hal

$(GEN): $(LOCAL_PATH)/IBaz.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IBaz.hal

# Build IBase.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp

GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal

$(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::IBaz

    android.hardware.tests.baz@1.0::IBase



$(GEN): $(LOCAL_PATH)/IBaz.hal

$(GEN): $(LOCAL_PATH)/IBase.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)
@@ -79,36 +83,40 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build IBase.hal

# Build IBaz.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java

GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal

$(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::IBase

    android.hardware.tests.baz@1.0::IBaz



$(GEN): $(LOCAL_PATH)/IBase.hal

$(GEN): $(LOCAL_PATH)/IBaz.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IBaz.hal

# Build IBase.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java

GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal

$(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::IBaz

    android.hardware.tests.baz@1.0::IBase



$(GEN): $(LOCAL_PATH)/IBaz.hal

$(GEN): $(LOCAL_PATH)/IBase.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

tests/foo/1.0/Android.mk

+19 −15
Original line number Diff line number Diff line
@@ -9,53 +9,57 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build IFoo.hal

# Build types.hal

#

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp

GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal

$(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::IFoo

    android.hardware.tests.foo@1.0::types



$(GEN): $(LOCAL_PATH)/IFoo.hal

$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IFooCallback.hal

# Build IFoo.hal

#

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal

$(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) \

    -Lc++ -randroid.hardware:hardware/interfaces \

    android.hardware.tests.foo@1.0::IFooCallback

    android.hardware.tests.foo@1.0::IFoo



$(GEN): $(LOCAL_PATH)/IFooCallback.hal

$(GEN): $(LOCAL_PATH)/IFoo.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal

# Build IFooCallback.hal

#

GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(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::types

    android.hardware.tests.foo@1.0::IFooCallback



$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/IFooCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)