summaryrefslogtreecommitdiffstats
path: root/light
diff options
context:
space:
mode:
authorSteven Moreland2017-08-10 17:15:40 -0500
committerSteven Moreland2017-08-14 15:25:09 -0500
commitdfd82875064da86c6282a112aa7c9d4ec61af9e2 (patch)
treebaec97614a1dc7bdd4e8afe1b0925b1040f4ea64 /light
parentfe2279d2cc34559ad6de63a4051c832203e31f34 (diff)
downloadplatform-hardware-interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.gz
platform-hardware-interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.xz
platform-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 'light')
-rw-r--r--light/2.0/Android.bp5
-rw-r--r--light/2.0/Android.mk134
2 files changed, 6 insertions, 133 deletions
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index cffdbe0a..7cc7f849 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -39,13 +39,16 @@ genrule {
39 ], 39 ],
40} 40}
41 41
42cc_library_shared { 42cc_library {
43 name: "android.hardware.light@2.0", 43 name: "android.hardware.light@2.0",
44 defaults: ["hidl-module-defaults"], 44 defaults: ["hidl-module-defaults"],
45 generated_sources: ["android.hardware.light@2.0_genc++"], 45 generated_sources: ["android.hardware.light@2.0_genc++"],
46 generated_headers: ["android.hardware.light@2.0_genc++_headers"], 46 generated_headers: ["android.hardware.light@2.0_genc++_headers"],
47 export_generated_headers: ["android.hardware.light@2.0_genc++_headers"], 47 export_generated_headers: ["android.hardware.light@2.0_genc++_headers"],
48 vendor_available: true, 48 vendor_available: true,
49 vndk: {
50 enabled: true,
51 },
49 shared_libs: [ 52 shared_libs: [
50 "libhidlbase", 53 "libhidlbase",
51 "libhidltransport", 54 "libhidltransport",
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk
index 24d7ab13..93211e19 100644
--- a/light/2.0/Android.mk
+++ b/light/2.0/Android.mk
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
15LOCAL_JAVA_LIBRARIES := \ 15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \ 16 android.hidl.base-V1.0-java \
17 17
18LOCAL_NO_STANDARD_LIBRARIES := true
19LOCAL_JAVA_LIBRARIES += core-oj hwbinder
18 20
19# 21#
20# Build types.hal (Brightness) 22# Build types.hal (Brightness)
@@ -134,137 +136,5 @@ LOCAL_GENERATED_SOURCES += $(GEN)
134include $(BUILD_JAVA_LIBRARY) 136include $(BUILD_JAVA_LIBRARY)
135 137
136 138
137################################################################################
138
139include $(CLEAR_VARS)
140LOCAL_MODULE := android.hardware.light-V2.0-java-static
141LOCAL_MODULE_CLASS := JAVA_LIBRARIES
142
143intermediates := $(call local-generated-sources-dir, COMMON)
144
145HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
146
147LOCAL_STATIC_JAVA_LIBRARIES := \
148 android.hidl.base-V1.0-java-static \
149
150
151#
152# Build types.hal (Brightness)
153#
154GEN := $(intermediates)/android/hardware/light/V2_0/Brightness.java
155$(GEN): $(HIDL)
156$(GEN): PRIVATE_HIDL := $(HIDL)
157$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
158$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
159$(GEN): PRIVATE_CUSTOM_TOOL = \
160 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
161 -Ljava \
162 -randroid.hardware:hardware/interfaces \
163 -randroid.hidl:system/libhidl/transport \
164 android.hardware.light@2.0::types.Brightness
165
166$(GEN): $(LOCAL_PATH)/types.hal
167 $(transform-generated-source)
168LOCAL_GENERATED_SOURCES += $(GEN)
169
170#
171# Build types.hal (Flash)
172#
173GEN := $(intermediates)/android/hardware/light/V2_0/Flash.java
174$(GEN): $(HIDL)
175$(GEN): PRIVATE_HIDL := $(HIDL)
176$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
177$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
178$(GEN): PRIVATE_CUSTOM_TOOL = \
179 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
180 -Ljava \
181 -randroid.hardware:hardware/interfaces \
182 -randroid.hidl:system/libhidl/transport \
183 android.hardware.light@2.0::types.Flash
184
185$(GEN): $(LOCAL_PATH)/types.hal
186 $(transform-generated-source)
187LOCAL_GENERATED_SOURCES += $(GEN)
188
189#
190# Build types.hal (LightState)
191#
192GEN := $(intermediates)/android/hardware/light/V2_0/LightState.java
193$(GEN): $(HIDL)
194$(GEN): PRIVATE_HIDL := $(HIDL)
195$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
196$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
197$(GEN): PRIVATE_CUSTOM_TOOL = \
198 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
199 -Ljava \
200 -randroid.hardware:hardware/interfaces \
201 -randroid.hidl:system/libhidl/transport \
202 android.hardware.light@2.0::types.LightState
203
204$(GEN): $(LOCAL_PATH)/types.hal
205 $(transform-generated-source)
206LOCAL_GENERATED_SOURCES += $(GEN)
207
208#
209# Build types.hal (Status)
210#
211GEN := $(intermediates)/android/hardware/light/V2_0/Status.java
212$(GEN): $(HIDL)
213$(GEN): PRIVATE_HIDL := $(HIDL)
214$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
215$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
216$(GEN): PRIVATE_CUSTOM_TOOL = \
217 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
218 -Ljava \
219 -randroid.hardware:hardware/interfaces \
220 -randroid.hidl:system/libhidl/transport \
221 android.hardware.light@2.0::types.Status
222
223$(GEN): $(LOCAL_PATH)/types.hal
224 $(transform-generated-source)
225LOCAL_GENERATED_SOURCES += $(GEN)
226
227#
228# Build types.hal (Type)
229#
230GEN := $(intermediates)/android/hardware/light/V2_0/Type.java
231$(GEN): $(HIDL)
232$(GEN): PRIVATE_HIDL := $(HIDL)
233$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
234$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
235$(GEN): PRIVATE_CUSTOM_TOOL = \
236 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
237 -Ljava \
238 -randroid.hardware:hardware/interfaces \
239 -randroid.hidl:system/libhidl/transport \
240 android.hardware.light@2.0::types.Type
241
242$(GEN): $(LOCAL_PATH)/types.hal
243 $(transform-generated-source)
244LOCAL_GENERATED_SOURCES += $(GEN)
245
246#
247# Build ILight.hal
248#
249GEN := $(intermediates)/android/hardware/light/V2_0/ILight.java
250$(GEN): $(HIDL)
251$(GEN): PRIVATE_HIDL := $(HIDL)
252$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal
253$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
254$(GEN): $(LOCAL_PATH)/types.hal
255$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
256$(GEN): PRIVATE_CUSTOM_TOOL = \
257 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
258 -Ljava \
259 -randroid.hardware:hardware/interfaces \
260 -randroid.hidl:system/libhidl/transport \
261 android.hardware.light@2.0::ILight
262
263$(GEN): $(LOCAL_PATH)/ILight.hal
264 $(transform-generated-source)
265LOCAL_GENERATED_SOURCES += $(GEN)
266include $(BUILD_STATIC_JAVA_LIBRARY)
267
268
269 139
270include $(call all-makefiles-under,$(LOCAL_PATH)) 140include $(call all-makefiles-under,$(LOCAL_PATH))