summaryrefslogtreecommitdiffstats
path: root/ir
diff options
context:
space:
mode:
authorSteven Moreland2017-10-11 11:39:21 -0500
committerandroid-build-merger2017-10-11 11:39:21 -0500
commit1d7374c5e168c825b75185af53c77f4eae9eea2c (patch)
treea7eced61ea6707420e7f706a64f4db63c0ec4611 /ir
parent58e7856b4f72ea28f7a2be3943d80d1e4003af54 (diff)
parent116161d94eca370d3054f0fe34b2c9d8acce70c4 (diff)
downloadplatform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.gz
platform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.xz
platform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.zip
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
Diffstat (limited to 'ir')
-rw-r--r--ir/1.0/Android.bp28
-rw-r--r--ir/1.0/Android.mk64
2 files changed, 27 insertions, 65 deletions
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
index e686d239..f5c93da7 100644
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -66,6 +66,33 @@ cc_library {
66} 66}
67 67
68genrule { 68genrule {
69 name: "android.hardware.ir-V1.0-java_gen_java",
70 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
72 srcs: [
73 ":android.hardware.ir@1.0_hal",
74 ],
75 out: [
76 "android/hardware/ir/V1_0/ConsumerIrFreqRange.java",
77 "android/hardware/ir/V1_0/IConsumerIr.java",
78 ],
79}
80
81java_library {
82 name: "android.hardware.ir-V1.0-java",
83 no_framework_libs: true,
84 defaults: ["hidl-java-module-defaults"],
85 srcs: [":android.hardware.ir-V1.0-java_gen_java"],
86 libs: [
87 "hwbinder",
88 "android.hidl.base-V1.0-java",
89 ]
90}
91
92// This package does not export any types. Not creating java constants export.
93
94
95genrule {
69 name: "android.hardware.ir@1.0-adapter-helper_genc++", 96 name: "android.hardware.ir@1.0-adapter-helper_genc++",
70 tools: ["hidl-gen"], 97 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0", 98 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
@@ -89,7 +116,6 @@ genrule {
89 ], 116 ],
90} 117}
91 118
92
93cc_library { 119cc_library {
94 name: "android.hardware.ir@1.0-adapter-helper", 120 name: "android.hardware.ir@1.0-adapter-helper",
95 defaults: ["hidl-module-defaults"], 121 defaults: ["hidl-module-defaults"],
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk
deleted file mode 100644
index eca46f5a..00000000
--- a/ir/1.0/Android.mk
+++ /dev/null
@@ -1,64 +0,0 @@
1# This file is autogenerated by hidl-gen. Do not edit manually.
2
3LOCAL_PATH := $(call my-dir)
4
5################################################################################
6
7include $(CLEAR_VARS)
8LOCAL_MODULE := android.hardware.ir-V1.0-java
9LOCAL_MODULE_CLASS := JAVA_LIBRARIES
10
11intermediates := $(call local-generated-sources-dir, COMMON)
12
13HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
14
15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \
17
18LOCAL_NO_STANDARD_LIBRARIES := true
19LOCAL_JAVA_LIBRARIES += core-oj hwbinder
20
21#
22# Build types.hal (ConsumerIrFreqRange)
23#
24GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
25$(GEN): $(HIDL)
26$(GEN): PRIVATE_HIDL := $(HIDL)
27$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
28$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
29$(GEN): PRIVATE_CUSTOM_TOOL = \
30 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
31 -Ljava \
32 -randroid.hardware:hardware/interfaces \
33 -randroid.hidl:system/libhidl/transport \
34 android.hardware.ir@1.0::types.ConsumerIrFreqRange
35
36$(GEN): $(LOCAL_PATH)/types.hal
37 $(transform-generated-source)
38LOCAL_GENERATED_SOURCES += $(GEN)
39
40#
41# Build IConsumerIr.hal
42#
43GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
44$(GEN): $(HIDL)
45$(GEN): PRIVATE_HIDL := $(HIDL)
46$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
47$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
48$(GEN): $(LOCAL_PATH)/types.hal
49$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
50$(GEN): PRIVATE_CUSTOM_TOOL = \
51 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
52 -Ljava \
53 -randroid.hardware:hardware/interfaces \
54 -randroid.hidl:system/libhidl/transport \
55 android.hardware.ir@1.0::IConsumerIr
56
57$(GEN): $(LOCAL_PATH)/IConsumerIr.hal
58 $(transform-generated-source)
59LOCAL_GENERATED_SOURCES += $(GEN)
60include $(BUILD_JAVA_LIBRARY)
61
62
63
64include $(call all-makefiles-under,$(LOCAL_PATH))