Update for Soong java makefiles.

Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
This commit is contained in:
Steven Moreland
2017-10-10 11:05:20 -07:00
parent b74728a92e
commit c3e80fa01e
102 changed files with 1748 additions and 11731 deletions

View File

@@ -65,6 +65,33 @@ cc_library {
],
}
genrule {
name: "android.hardware.ir-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.ir@1.0",
srcs: [
":android.hardware.ir@1.0_hal",
],
out: [
"android/hardware/ir/V1_0/ConsumerIrFreqRange.java",
"android/hardware/ir/V1_0/IConsumerIr.java",
],
}
java_library {
name: "android.hardware.ir-V1.0-java",
no_framework_libs: true,
defaults: ["hidl-java-module-defaults"],
srcs: [":android.hardware.ir-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.ir@1.0-adapter-helper_genc++",
tools: ["hidl-gen"],
@@ -89,7 +116,6 @@ genrule {
],
}
cc_library {
name: "android.hardware.ir@1.0-adapter-helper",
defaults: ["hidl-module-defaults"],

View File

@@ -1,64 +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.ir-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 (ConsumerIrFreqRange)
#
GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.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.ir@1.0::types.ConsumerIrFreqRange
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IConsumerIr.hal
#
GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.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.ir@1.0::IConsumerIr
$(GEN): $(LOCAL_PATH)/IConsumerIr.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))