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

Commit c0ba83e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updated makefiles (includes java-library rules for applicable packages)."

parents 98908753 7ab75a73

benchmarks/msgq/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

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

    android.hardware.benchmarks.msgq@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ



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

	$(transform-generated-source)

nfc/1.0/Android.mk

+110 −14
Original line number Diff line number Diff line
@@ -19,43 +19,43 @@ $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.nfc@1.0::INfc



$(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_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

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

    android.hardware.nfc@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.nfc@1.0::INfcClientCallback



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

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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build INfcClientCallback.hal

# Build types.hal

#

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

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

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

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

    android.hardware.nfc@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.nfc@1.0::types



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

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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)
@@ -67,3 +67,99 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)



################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.nfc@1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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)

#

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

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

    -Ljava -randroid.hardware:hardware/interfaces \

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_event_t)

#

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

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

    -Ljava -randroid.hardware:hardware/interfaces \

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

#

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

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

    -Ljava -randroid.hardware:hardware/interfaces \

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)

tests/bar/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

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

    android.hardware.tests.bar@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.tests.bar@1.0::IBar



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

	$(transform-generated-source)

tests/baz/1.0/Android.mk

+68 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

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



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

	$(transform-generated-source)
@@ -36,7 +36,7 @@ $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

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



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

	$(transform-generated-source)
@@ -53,7 +53,7 @@ $(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::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

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



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

	$(transform-generated-source)
@@ -67,3 +67,65 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)



################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.tests.baz@1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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

#

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

#

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

$(GEN): $(HIDL)

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

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)

tests/expression/1.0/Android.mk

+30 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

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

    android.hardware.tests.expression@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))

    android.hardware.tests.expression@1.0::IExpression



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

	$(transform-generated-source)
@@ -33,3 +33,31 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)



################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.tests.expression@1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build IExpression.hal

#

GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpression.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

    -Ljava -randroid.hardware:hardware/interfaces \

    android.hardware.tests.expression@1.0::IExpression



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)