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

Commit 495391aa authored by Andreas Huber's avatar Andreas Huber
Browse files

Updated makefiles that also add static java library targets. 

Bug: 31684178
Test: hidl_test and hidl_test_java
Change-Id: Ib53d1be2b1535837ca97cb61796e335141fc7611
parent 678fa1f4

nfc/1.0/Android.mk

+105 −1
Original line number Diff line number Diff line
@@ -85,6 +85,40 @@ intermediates := $(local-generated-sources-dir) 


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



#

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



#

# Build types.hal (nfc_data_t)

#
@@ -102,6 +136,58 @@ $(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)





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



include $(CLEAR_VARS)

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

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build types.hal (nfc_event_t)

#
@@ -136,6 +222,23 @@ $(GEN): $(LOCAL_PATH)/types.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 INfc.hal

#
@@ -175,7 +278,8 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)

include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

tests/baz/1.0/Android.mk

+68 −0
Original line number Diff line number Diff line
@@ -157,4 +157,72 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

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

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_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 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_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

tests/expression/1.0/Android.mk

+30 −0
Original line number Diff line number Diff line
@@ -64,4 +64,34 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

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

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_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

tests/libhwbinder/1.0/Android.mk

+30 −0
Original line number Diff line number Diff line
@@ -64,4 +64,34 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build IBenchmark.hal

#

GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/IBenchmark.java

$(GEN): $(HIDL)

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

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

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

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

    -Ljava -randroid.hardware:hardware/interfaces \

    android.hardware.tests.libhwbinder@1.0::IBenchmark



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

wifi/1.0/Android.mk

+130 −0
Original line number Diff line number Diff line
@@ -239,3 +239,133 @@ $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build types.hal (CommandFailureReason)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/CommandFailureReason.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.wifi@1.0::types.CommandFailureReason



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (FailureReason)

#

GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.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.wifi@1.0::types.FailureReason



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifi.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/IWifi.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiChip.hal

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

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiEventCallback.hal

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

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

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

    -Ljava -randroid.hardware:hardware/interfaces \

    android.hardware.wifi@1.0::IWifi



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifiChip.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChip.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiChipEventCallback.hal

$(GEN): $(LOCAL_PATH)/IWifiChipEventCallback.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.wifi@1.0::IWifiChip



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifiChipEventCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChipEventCallback.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChipEventCallback.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.wifi@1.0::IWifiChipEventCallback



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IWifiEventCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiEventCallback.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiEventCallback.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.wifi@1.0::IWifiEventCallback



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))