diff options
author | Steven Moreland | 2017-08-11 17:56:24 -0500 |
---|---|---|
committer | Steven Moreland | 2017-08-11 17:56:56 -0500 |
commit | 1020ebedfbf7c5014896266a98de562a6116d4a2 (patch) | |
tree | 496d54d2b5821a4fbf638a491b125230fa21a713 /biometrics/fingerprint | |
parent | 8ac1971678999c46338d751fdaec16c2e4bd78cb (diff) | |
download | platform-hardware-interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.tar.gz platform-hardware-interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.tar.xz platform-hardware-interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.zip |
Revert "Updating all makefiles."
This reverts commit 8ac1971678999c46338d751fdaec16c2e4bd78cb.
Reason for revert: Didn't remove automotive changes from this CL.
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
Diffstat (limited to 'biometrics/fingerprint')
-rw-r--r-- | biometrics/fingerprint/2.1/Android.mk | 233 |
1 files changed, 231 insertions, 2 deletions
diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk index 304f6a90..2f323716 100644 --- a/biometrics/fingerprint/2.1/Android.mk +++ b/biometrics/fingerprint/2.1/Android.mk | |||
@@ -15,8 +15,6 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
15 | LOCAL_JAVA_LIBRARIES := \ | 15 | LOCAL_JAVA_LIBRARIES := \ |
16 | android.hidl.base-V1.0-java \ | 16 | android.hidl.base-V1.0-java \ |
17 | 17 | ||
18 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
19 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
20 | 18 | ||
21 | # | 19 | # |
22 | # Build types.hal (FingerprintAcquired) | 20 | # Build types.hal (FingerprintAcquired) |
@@ -235,5 +233,236 @@ LOCAL_GENERATED_SOURCES += $(GEN) | |||
235 | include $(BUILD_JAVA_LIBRARY) | 233 | include $(BUILD_JAVA_LIBRARY) |
236 | 234 | ||
237 | 235 | ||
236 | ################################################################################ | ||
237 | |||
238 | include $(CLEAR_VARS) | ||
239 | LOCAL_MODULE := android.hardware.biometrics.fingerprint-V2.1-java-static | ||
240 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
241 | |||
242 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
243 | |||
244 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
245 | |||
246 | LOCAL_STATIC_JAVA_LIBRARIES := \ | ||
247 | android.hidl.base-V1.0-java-static \ | ||
248 | |||
249 | |||
250 | # | ||
251 | # Build types.hal (FingerprintAcquired) | ||
252 | # | ||
253 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.java | ||
254 | $(GEN): $(HIDL) | ||
255 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
256 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
257 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
258 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
259 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
260 | -Ljava \ | ||
261 | -randroid.hardware:hardware/interfaces \ | ||
262 | -randroid.hidl:system/libhidl/transport \ | ||
263 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintAcquired | ||
264 | |||
265 | $(GEN): $(LOCAL_PATH)/types.hal | ||
266 | $(transform-generated-source) | ||
267 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
268 | |||
269 | # | ||
270 | # Build types.hal (FingerprintAcquiredInfo) | ||
271 | # | ||
272 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java | ||
273 | $(GEN): $(HIDL) | ||
274 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
275 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
276 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
277 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
278 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
279 | -Ljava \ | ||
280 | -randroid.hardware:hardware/interfaces \ | ||
281 | -randroid.hidl:system/libhidl/transport \ | ||
282 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintAcquiredInfo | ||
283 | |||
284 | $(GEN): $(LOCAL_PATH)/types.hal | ||
285 | $(transform-generated-source) | ||
286 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
287 | |||
288 | # | ||
289 | # Build types.hal (FingerprintAuthenticated) | ||
290 | # | ||
291 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java | ||
292 | $(GEN): $(HIDL) | ||
293 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
294 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
295 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
296 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
297 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
298 | -Ljava \ | ||
299 | -randroid.hardware:hardware/interfaces \ | ||
300 | -randroid.hidl:system/libhidl/transport \ | ||
301 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintAuthenticated | ||
302 | |||
303 | $(GEN): $(LOCAL_PATH)/types.hal | ||
304 | $(transform-generated-source) | ||
305 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
306 | |||
307 | # | ||
308 | # Build types.hal (FingerprintEnroll) | ||
309 | # | ||
310 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java | ||
311 | $(GEN): $(HIDL) | ||
312 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
313 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
314 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
315 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
316 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
317 | -Ljava \ | ||
318 | -randroid.hardware:hardware/interfaces \ | ||
319 | -randroid.hidl:system/libhidl/transport \ | ||
320 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintEnroll | ||
321 | |||
322 | $(GEN): $(LOCAL_PATH)/types.hal | ||
323 | $(transform-generated-source) | ||
324 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
325 | |||
326 | # | ||
327 | # Build types.hal (FingerprintError) | ||
328 | # | ||
329 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java | ||
330 | $(GEN): $(HIDL) | ||
331 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
332 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
333 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
334 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
335 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
336 | -Ljava \ | ||
337 | -randroid.hardware:hardware/interfaces \ | ||
338 | -randroid.hidl:system/libhidl/transport \ | ||
339 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintError | ||
340 | |||
341 | $(GEN): $(LOCAL_PATH)/types.hal | ||
342 | $(transform-generated-source) | ||
343 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
344 | |||
345 | # | ||
346 | # Build types.hal (FingerprintFingerId) | ||
347 | # | ||
348 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java | ||
349 | $(GEN): $(HIDL) | ||
350 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
351 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
352 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
353 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
354 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
355 | -Ljava \ | ||
356 | -randroid.hardware:hardware/interfaces \ | ||
357 | -randroid.hidl:system/libhidl/transport \ | ||
358 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintFingerId | ||
359 | |||
360 | $(GEN): $(LOCAL_PATH)/types.hal | ||
361 | $(transform-generated-source) | ||
362 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
363 | |||
364 | # | ||
365 | # Build types.hal (FingerprintIterator) | ||
366 | # | ||
367 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java | ||
368 | $(GEN): $(HIDL) | ||
369 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
370 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
371 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
372 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
373 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
374 | -Ljava \ | ||
375 | -randroid.hardware:hardware/interfaces \ | ||
376 | -randroid.hidl:system/libhidl/transport \ | ||
377 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintIterator | ||
378 | |||
379 | $(GEN): $(LOCAL_PATH)/types.hal | ||
380 | $(transform-generated-source) | ||
381 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
382 | |||
383 | # | ||
384 | # Build types.hal (FingerprintMsgType) | ||
385 | # | ||
386 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java | ||
387 | $(GEN): $(HIDL) | ||
388 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
389 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
390 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
391 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
392 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
393 | -Ljava \ | ||
394 | -randroid.hardware:hardware/interfaces \ | ||
395 | -randroid.hidl:system/libhidl/transport \ | ||
396 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintMsgType | ||
397 | |||
398 | $(GEN): $(LOCAL_PATH)/types.hal | ||
399 | $(transform-generated-source) | ||
400 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
401 | |||
402 | # | ||
403 | # Build types.hal (RequestStatus) | ||
404 | # | ||
405 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java | ||
406 | $(GEN): $(HIDL) | ||
407 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
408 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
409 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
410 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
411 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
412 | -Ljava \ | ||
413 | -randroid.hardware:hardware/interfaces \ | ||
414 | -randroid.hidl:system/libhidl/transport \ | ||
415 | android.hardware.biometrics.fingerprint@2.1::types.RequestStatus | ||
416 | |||
417 | $(GEN): $(LOCAL_PATH)/types.hal | ||
418 | $(transform-generated-source) | ||
419 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
420 | |||
421 | # | ||
422 | # Build IBiometricsFingerprint.hal | ||
423 | # | ||
424 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java | ||
425 | $(GEN): $(HIDL) | ||
426 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
427 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprint.hal | ||
428 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
429 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
430 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
431 | $(GEN): $(LOCAL_PATH)/types.hal | ||
432 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
433 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
434 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
435 | -Ljava \ | ||
436 | -randroid.hardware:hardware/interfaces \ | ||
437 | -randroid.hidl:system/libhidl/transport \ | ||
438 | android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprint | ||
439 | |||
440 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprint.hal | ||
441 | $(transform-generated-source) | ||
442 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
443 | |||
444 | # | ||
445 | # Build IBiometricsFingerprintClientCallback.hal | ||
446 | # | ||
447 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java | ||
448 | $(GEN): $(HIDL) | ||
449 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
450 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
451 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
452 | $(GEN): $(LOCAL_PATH)/types.hal | ||
453 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
454 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
455 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
456 | -Ljava \ | ||
457 | -randroid.hardware:hardware/interfaces \ | ||
458 | -randroid.hidl:system/libhidl/transport \ | ||
459 | android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprintClientCallback | ||
460 | |||
461 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
462 | $(transform-generated-source) | ||
463 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
464 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
465 | |||
466 | |||
238 | 467 | ||
239 | include $(call all-makefiles-under,$(LOCAL_PATH)) | 468 | include $(call all-makefiles-under,$(LOCAL_PATH)) |