diff options
author | Steven Moreland <smoreland@google.com> | 2017-10-10 11:05:20 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-10-10 23:07:20 +0000 |
commit | c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9 (patch) | |
tree | 1a29996c5260aed3a1567384f29a2220603da788 /tv | |
parent | b74728a92e88c354cf5f4e07981095ed2c2e8840 (diff) | |
download | android_hardware_interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.tar.gz android_hardware_interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.tar.bz2 android_hardware_interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.zip |
Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
Diffstat (limited to 'tv')
-rw-r--r-- | tv/cec/1.0/Android.bp | 40 | ||||
-rw-r--r-- | tv/cec/1.0/Android.mk | 296 | ||||
-rw-r--r-- | tv/input/1.0/Android.bp | 22 | ||||
-rw-r--r-- | tv/input/1.0/Android.mk | 41 |
4 files changed, 60 insertions, 339 deletions
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index f333777b7..8c538c5c6 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -73,6 +73,45 @@ cc_library { } genrule { + name: "android.hardware.tv.cec-V1.0-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", + srcs: [ + ":android.hardware.tv.cec@1.0_hal", + ], + out: [ + "android/hardware/tv/cec/V1_0/AbortReason.java", + "android/hardware/tv/cec/V1_0/CecDeviceType.java", + "android/hardware/tv/cec/V1_0/CecLogicalAddress.java", + "android/hardware/tv/cec/V1_0/CecMessage.java", + "android/hardware/tv/cec/V1_0/CecMessageType.java", + "android/hardware/tv/cec/V1_0/HdmiPortInfo.java", + "android/hardware/tv/cec/V1_0/HdmiPortType.java", + "android/hardware/tv/cec/V1_0/HotplugEvent.java", + "android/hardware/tv/cec/V1_0/MaxLength.java", + "android/hardware/tv/cec/V1_0/OptionKey.java", + "android/hardware/tv/cec/V1_0/Result.java", + "android/hardware/tv/cec/V1_0/SendMessageResult.java", + "android/hardware/tv/cec/V1_0/IHdmiCec.java", + "android/hardware/tv/cec/V1_0/IHdmiCecCallback.java", + ], +} + +java_library { + name: "android.hardware.tv.cec-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.tv.cec-V1.0-java_gen_java"], + libs: [ + "hwbinder", + "android.hidl.base-V1.0-java", + ] +} + +// This package does not export any types. Not creating java constants export. + + +genrule { name: "android.hardware.tv.cec@1.0-adapter-helper_genc++", tools: ["hidl-gen"], cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0", @@ -98,7 +137,6 @@ genrule { ], } - cc_library { name: "android.hardware.tv.cec@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk deleted file mode 100644 index 7cccf90cd..000000000 --- a/tv/cec/1.0/Android.mk +++ /dev/null @@ -1,296 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.cec-V1.0-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build types.hal (AbortReason) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/AbortReason.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.AbortReason - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CecDeviceType) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/CecDeviceType.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.CecDeviceType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CecLogicalAddress) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/CecLogicalAddress.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.CecLogicalAddress - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CecMessage) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/CecMessage.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.CecMessage - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CecMessageType) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/CecMessageType.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.CecMessageType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HdmiPortInfo) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/HdmiPortInfo.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.HdmiPortInfo - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HdmiPortType) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/HdmiPortType.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.HdmiPortType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HotplugEvent) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/HotplugEvent.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.HotplugEvent - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (MaxLength) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/MaxLength.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.MaxLength - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (OptionKey) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/OptionKey.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.OptionKey - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Result) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/Result.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.Result - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (SendMessageResult) -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/SendMessageResult.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::types.SendMessageResult - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IHdmiCec.hal -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/IHdmiCec.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHdmiCec.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IHdmiCecCallback.hal -$(GEN): $(LOCAL_PATH)/IHdmiCecCallback.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::IHdmiCec - -$(GEN): $(LOCAL_PATH)/IHdmiCec.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IHdmiCecCallback.hal -# -GEN := $(intermediates)/android/hardware/tv/cec/V1_0/IHdmiCecCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHdmiCecCallback.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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.cec@1.0::IHdmiCecCallback - -$(GEN): $(LOCAL_PATH)/IHdmiCecCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp index b07b2c75d..3ec81e889 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -74,6 +74,27 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +genrule { + name: "android.hardware.tv.input-V1.0-java-constants_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0", + srcs: [ + ":android.hardware.tv.input@1.0_hal", + ], + out: [ + "android/hardware/tv/input/V1_0/Constants.java", + ], +} + +java_library { + name: "android.hardware.tv.input-V1.0-java-constants", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.tv.input-V1.0-java-constants_gen_java"], +} + genrule { name: "android.hardware.tv.input@1.0-adapter-helper_genc++", tools: ["hidl-gen"], @@ -100,7 +121,6 @@ genrule { ], } - cc_library { name: "android.hardware.tv.input@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/tv/input/1.0/Android.mk b/tv/input/1.0/Android.mk deleted file mode 100644 index aa1cf70de..000000000 --- a/tv/input/1.0/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.input-V1.0-java-constants -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) -# -GEN := $(intermediates)/android/hardware/tv/input/V1_0/Constants.java -$(GEN): $(HIDL) -$(GEN): $(LOCAL_PATH)/types.hal -$(GEN): $(LOCAL_PATH)/ITvInput.hal -$(GEN): $(LOCAL_PATH)/ITvInputCallback.hal - -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava-constants \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tv.input@1.0 - -$(GEN): - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -# Avoid dependency cycle of framework.jar -> this-library -> framework.jar -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj - -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |