diff options
author | Steven Moreland <smoreland@google.com> | 2017-10-11 16:39:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 16:39:21 +0000 |
commit | 1d7374c5e168c825b75185af53c77f4eae9eea2c (patch) | |
tree | a7eced61ea6707420e7f706a64f4db63c0ec4611 /biometrics | |
parent | 58e7856b4f72ea28f7a2be3943d80d1e4003af54 (diff) | |
parent | 116161d94eca370d3054f0fe34b2c9d8acce70c4 (diff) | |
download | platform_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.gz platform_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.bz2 platform_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.zip |
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e
Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
Diffstat (limited to 'biometrics')
-rw-r--r-- | biometrics/fingerprint/2.1/Android.bp | 37 | ||||
-rw-r--r-- | biometrics/fingerprint/2.1/Android.mk | 239 |
2 files changed, 36 insertions, 240 deletions
diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp index e6e48273ea..16f83b4d88 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp @@ -73,6 +73,42 @@ cc_library { } genrule { + name: "android.hardware.biometrics.fingerprint-V2.1-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", + srcs: [ + ":android.hardware.biometrics.fingerprint@2.1_hal", + ], + out: [ + "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java", + "android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java", + "android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java", + "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java", + "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java", + ], +} + +java_library { + name: "android.hardware.biometrics.fingerprint-V2.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.biometrics.fingerprint-V2.1-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.biometrics.fingerprint@2.1-adapter-helper_genc++", tools: ["hidl-gen"], cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", @@ -98,7 +134,6 @@ genrule { ], } - cc_library { name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk deleted file mode 100644 index 304f6a90d9..0000000000 --- a/biometrics/fingerprint/2.1/Android.mk +++ /dev/null @@ -1,239 +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.biometrics.fingerprint-V2.1-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 (FingerprintAcquired) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.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.biometrics.fingerprint@2.1::types.FingerprintAcquired - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintAcquiredInfo) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.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.biometrics.fingerprint@2.1::types.FingerprintAcquiredInfo - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintAuthenticated) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.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.biometrics.fingerprint@2.1::types.FingerprintAuthenticated - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintEnroll) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.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.biometrics.fingerprint@2.1::types.FingerprintEnroll - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintError) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintError.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.biometrics.fingerprint@2.1::types.FingerprintError - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintFingerId) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.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.biometrics.fingerprint@2.1::types.FingerprintFingerId - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintIterator) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.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.biometrics.fingerprint@2.1::types.FingerprintIterator - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (FingerprintMsgType) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.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.biometrics.fingerprint@2.1::types.FingerprintMsgType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (RequestStatus) -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/RequestStatus.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.biometrics.fingerprint@2.1::types.RequestStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IBiometricsFingerprint.hal -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprint.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal -$(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.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.biometrics.fingerprint@2.1::IBiometricsFingerprint - -$(GEN): $(LOCAL_PATH)/IBiometricsFingerprint.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IBiometricsFingerprintClientCallback.hal -# -GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.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.biometrics.fingerprint@2.1::IBiometricsFingerprintClientCallback - -$(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |