summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-11-13 11:20:49 -0600
committerSteven Moreland2017-11-13 13:39:07 -0600
commitc2f829a1d2673f91add6bcd536c7d4fe753d0447 (patch)
treea586e3a4ea66f147f229a6b14a33291fa5182977 /thermal
parent7c2d2454de95db7429b30a7701581041889bb873 (diff)
downloadplatform-hardware-interfaces-c2f829a1d2673f91add6bcd536c7d4fe753d0447.tar.gz
platform-hardware-interfaces-c2f829a1d2673f91add6bcd536c7d4fe753d0447.tar.xz
platform-hardware-interfaces-c2f829a1d2673f91add6bcd536c7d4fe753d0447.zip
Updating makefiles for hidl_interface.
Bug: 64487114 Test: manual Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812 Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Diffstat (limited to 'thermal')
-rw-r--r--thermal/1.0/Android.bp195
-rw-r--r--thermal/1.1/Android.bp72
-rw-r--r--thermal/1.1/Android.mk65
3 files changed, 27 insertions, 305 deletions
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 43a0f68c..e764e284 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -1,189 +1,28 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.thermal@1.0_hal",
5 srcs: [
6 "types.hal",
7 "IThermal.hal",
8 ],
9}
10
11genrule {
12 name: "android.hardware.thermal@1.0_genc++",
13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
15 srcs: [
16 ":android.hardware.thermal@1.0_hal",
17 ],
18 out: [
19 "android/hardware/thermal/1.0/types.cpp",
20 "android/hardware/thermal/1.0/ThermalAll.cpp",
21 ],
22}
23
24genrule {
25 name: "android.hardware.thermal@1.0_genc++_headers",
26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
28 srcs: [
29 ":android.hardware.thermal@1.0_hal",
30 ],
31 out: [
32 "android/hardware/thermal/1.0/types.h",
33 "android/hardware/thermal/1.0/hwtypes.h",
34 "android/hardware/thermal/1.0/IThermal.h",
35 "android/hardware/thermal/1.0/IHwThermal.h",
36 "android/hardware/thermal/1.0/BnHwThermal.h",
37 "android/hardware/thermal/1.0/BpHwThermal.h",
38 "android/hardware/thermal/1.0/BsThermal.h",
39 ],
40}
41
42cc_library {
43 name: "android.hardware.thermal@1.0", 4 name: "android.hardware.thermal@1.0",
44 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
45 generated_sources: ["android.hardware.thermal@1.0_genc++"],
46 generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
47 export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
48 vendor_available: true,
49 vndk: { 6 vndk: {
50 enabled: true, 7 enabled: true,
51 }, 8 },
52 shared_libs: [
53 "libhidlbase",
54 "libhidltransport",
55 "libhwbinder",
56 "liblog",
57 "libutils",
58 "libcutils",
59 ],
60 export_shared_lib_headers: [
61 "libhidlbase",
62 "libhidltransport",
63 "libhwbinder",
64 "libutils",
65 ],
66}
67
68genrule {
69 name: "android.hardware.thermal-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.thermal@1.0",
72 srcs: [
73 ":android.hardware.thermal@1.0_hal",
74 ],
75 out: [
76 "android/hardware/thermal/V1_0/CoolingDevice.java",
77 "android/hardware/thermal/V1_0/CoolingType.java",
78 "android/hardware/thermal/V1_0/CpuUsage.java",
79 "android/hardware/thermal/V1_0/Temperature.java",
80 "android/hardware/thermal/V1_0/TemperatureType.java",
81 "android/hardware/thermal/V1_0/ThermalStatus.java",
82 "android/hardware/thermal/V1_0/ThermalStatusCode.java",
83 "android/hardware/thermal/V1_0/IThermal.java",
84 ],
85}
86
87java_library {
88 name: "android.hardware.thermal-V1.0-java",
89 no_framework_libs: true,
90 defaults: ["hidl-java-module-defaults"],
91 srcs: [":android.hardware.thermal-V1.0-java_gen_java"],
92 libs: [
93 "hwbinder",
94 "android.hidl.base-V1.0-java",
95 ]
96}
97
98genrule {
99 name: "android.hardware.thermal-V1.0-java-constants_gen_java",
100 tools: ["hidl-gen"],
101 cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
102 srcs: [
103 ":android.hardware.thermal@1.0_hal",
104 ],
105 out: [
106 "android/hardware/thermal/V1_0/Constants.java",
107 ],
108}
109
110java_library {
111 name: "android.hardware.thermal-V1.0-java-constants",
112 no_framework_libs: true,
113 defaults: ["hidl-java-module-defaults"],
114 srcs: [":android.hardware.thermal-V1.0-java-constants_gen_java"],
115}
116
117genrule {
118 name: "android.hardware.thermal@1.0-adapter-helper_genc++",
119 tools: ["hidl-gen"],
120 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
121 srcs: [
122 ":android.hardware.thermal@1.0_hal",
123 ],
124 out: [
125 "android/hardware/thermal/1.0/AThermal.cpp",
126 ],
127}
128
129genrule {
130 name: "android.hardware.thermal@1.0-adapter-helper_genc++_headers",
131 tools: ["hidl-gen"],
132 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
133 srcs: [ 9 srcs: [
134 ":android.hardware.thermal@1.0_hal", 10 "types.hal",
135 ], 11 "IThermal.hal",
136 out: [
137 "android/hardware/thermal/1.0/AThermal.h",
138 ], 12 ],
139} 13 interfaces: [
140 14 "android.hidl.base@1.0",
141cc_library {
142 name: "android.hardware.thermal@1.0-adapter-helper",
143 defaults: ["hidl-module-defaults"],
144 generated_sources: ["android.hardware.thermal@1.0-adapter-helper_genc++"],
145 generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"],
146 export_generated_headers: ["android.hardware.thermal@1.0-adapter-helper_genc++_headers"],
147 vendor_available: true,
148 shared_libs: [
149 "libhidlbase",
150 "libhidltransport",
151 "libhwbinder",
152 "liblog",
153 "libutils",
154 "libcutils",
155 "libhidladapter",
156 "android.hardware.thermal@1.0",
157 "android.hidl.base@1.0-adapter-helper",
158 ], 15 ],
159 export_shared_lib_headers: [ 16 types: [
160 "libhidlbase", 17 "CoolingDevice",
161 "libhidltransport", 18 "CoolingType",
162 "libhwbinder", 19 "CpuUsage",
163 "libutils", 20 "Temperature",
164 "libhidladapter", 21 "TemperatureType",
165 "android.hardware.thermal@1.0", 22 "ThermalStatus",
166 "android.hidl.base@1.0-adapter-helper", 23 "ThermalStatusCode",
167 ], 24 ],
25 gen_java: true,
26 gen_java_constants: true,
168} 27}
169 28
170genrule {
171 name: "android.hardware.thermal@1.0-adapter_genc++",
172 tools: ["hidl-gen"],
173 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
174 out: ["main.cpp"]
175}
176
177cc_test {
178 name: "android.hardware.thermal@1.0-adapter",
179 defaults: ["hidl-module-defaults"],
180 shared_libs: [
181 "libhidladapter",
182 "libhidlbase",
183 "libhidltransport",
184 "libutils",
185 "android.hardware.thermal@1.0",
186 "android.hardware.thermal@1.0-adapter-helper",
187 ],
188 generated_sources: ["android.hardware.thermal@1.0-adapter_genc++"],
189}
diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp
index 0985d947..8c0f1f9c 100644
--- a/thermal/1.1/Android.bp
+++ b/thermal/1.1/Android.bp
@@ -1,71 +1,19 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.thermal@1.1_hal",
5 srcs: [
6 "IThermal.hal",
7 "IThermalCallback.hal",
8 ],
9}
10
11genrule {
12 name: "android.hardware.thermal@1.1_genc++",
13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1",
15 srcs: [
16 ":android.hardware.thermal@1.1_hal",
17 ],
18 out: [
19 "android/hardware/thermal/1.1/ThermalAll.cpp",
20 "android/hardware/thermal/1.1/ThermalCallbackAll.cpp",
21 ],
22}
23
24genrule {
25 name: "android.hardware.thermal@1.1_genc++_headers",
26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1",
28 srcs: [
29 ":android.hardware.thermal@1.1_hal",
30 ],
31 out: [
32 "android/hardware/thermal/1.1/IThermal.h",
33 "android/hardware/thermal/1.1/IHwThermal.h",
34 "android/hardware/thermal/1.1/BnHwThermal.h",
35 "android/hardware/thermal/1.1/BpHwThermal.h",
36 "android/hardware/thermal/1.1/BsThermal.h",
37 "android/hardware/thermal/1.1/IThermalCallback.h",
38 "android/hardware/thermal/1.1/IHwThermalCallback.h",
39 "android/hardware/thermal/1.1/BnHwThermalCallback.h",
40 "android/hardware/thermal/1.1/BpHwThermalCallback.h",
41 "android/hardware/thermal/1.1/BsThermalCallback.h",
42 ],
43}
44
45cc_library {
46 name: "android.hardware.thermal@1.1", 4 name: "android.hardware.thermal@1.1",
47 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
48 generated_sources: ["android.hardware.thermal@1.1_genc++"],
49 generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
50 export_generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
51 vendor_available: true,
52 vndk: { 6 vndk: {
53 enabled: true, 7 enabled: true,
54 }, 8 },
55 shared_libs: [ 9 srcs: [
56 "libhidlbase", 10 "IThermal.hal",
57 "libhidltransport", 11 "IThermalCallback.hal",
58 "libhwbinder",
59 "liblog",
60 "libutils",
61 "libcutils",
62 "android.hardware.thermal@1.0",
63 ], 12 ],
64 export_shared_lib_headers: [ 13 interfaces: [
65 "libhidlbase",
66 "libhidltransport",
67 "libhwbinder",
68 "libutils",
69 "android.hardware.thermal@1.0", 14 "android.hardware.thermal@1.0",
15 "android.hidl.base@1.0",
70 ], 16 ],
17 gen_java: true,
71} 18}
19
diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk
deleted file mode 100644
index 059ac8bd..00000000
--- a/thermal/1.1/Android.mk
+++ /dev/null
@@ -1,65 +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.thermal-V1.1-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.hardware.thermal-V1.0-java \
17 android.hidl.base-V1.0-java \
18
19LOCAL_NO_STANDARD_LIBRARIES := true
20LOCAL_JAVA_LIBRARIES += core-oj hwbinder
21
22#
23# Build IThermal.hal
24#
25GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermal.java
26$(GEN): $(HIDL)
27$(GEN): PRIVATE_HIDL := $(HIDL)
28$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermal.hal
29$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IThermalCallback.hal
30$(GEN): $(LOCAL_PATH)/IThermalCallback.hal
31$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
32$(GEN): PRIVATE_CUSTOM_TOOL = \
33 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
34 -Ljava \
35 -randroid.hardware:hardware/interfaces \
36 -randroid.hidl:system/libhidl/transport \
37 android.hardware.thermal@1.1::IThermal
38
39$(GEN): $(LOCAL_PATH)/IThermal.hal
40 $(transform-generated-source)
41LOCAL_GENERATED_SOURCES += $(GEN)
42
43#
44# Build IThermalCallback.hal
45#
46GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermalCallback.java
47$(GEN): $(HIDL)
48$(GEN): PRIVATE_HIDL := $(HIDL)
49$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermalCallback.hal
50$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
51$(GEN): PRIVATE_CUSTOM_TOOL = \
52 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
53 -Ljava \
54 -randroid.hardware:hardware/interfaces \
55 -randroid.hidl:system/libhidl/transport \
56 android.hardware.thermal@1.1::IThermalCallback
57
58$(GEN): $(LOCAL_PATH)/IThermalCallback.hal
59 $(transform-generated-source)
60LOCAL_GENERATED_SOURCES += $(GEN)
61include $(BUILD_JAVA_LIBRARY)
62
63
64
65include $(call all-makefiles-under,$(LOCAL_PATH))