diff options
author | Steven Moreland <smoreland@google.com> | 2017-08-10 15:15:40 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-08-14 20:25:09 +0000 |
commit | dfd82875064da86c6282a112aa7c9d4ec61af9e2 (patch) | |
tree | baec97614a1dc7bdd4e8afe1b0925b1040f4ea64 /tv | |
parent | fe2279d2cc34559ad6de63a4051c832203e31f34 (diff) | |
download | android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.gz android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.bz2 android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.zip |
Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
Diffstat (limited to 'tv')
-rw-r--r-- | tv/cec/1.0/Android.bp | 5 | ||||
-rw-r--r-- | tv/cec/1.0/Android.mk | 290 | ||||
-rw-r--r-- | tv/input/1.0/Android.bp | 5 |
3 files changed, 10 insertions, 290 deletions
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index bf3ffe214..c9da7373e 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -46,13 +46,16 @@ genrule { ], } -cc_library_shared { +cc_library { name: "android.hardware.tv.cec@1.0", defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tv.cec@1.0_genc++"], generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], vendor_available: true, + vndk: { + enabled: true, + }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk index 1e3853d08..7cccf90cd 100644 --- a/tv/cec/1.0/Android.mk +++ b/tv/cec/1.0/Android.mk @@ -15,6 +15,8 @@ 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) @@ -290,293 +292,5 @@ LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.cec-V1.0-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java-static \ - - -# -# 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_STATIC_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 a3f8c9401..22ea1d847 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -46,13 +46,16 @@ genrule { ], } -cc_library_shared { +cc_library { name: "android.hardware.tv.input@1.0", defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tv.input@1.0_genc++"], generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], vendor_available: true, + vndk: { + enabled: true, + }, shared_libs: [ "libhidlbase", "libhidltransport", |