diff options
author | Steven Moreland | 2017-10-11 11:31:07 -0500 |
---|---|---|
committer | android-build-merger | 2017-10-11 11:31:07 -0500 |
commit | 116161d94eca370d3054f0fe34b2c9d8acce70c4 (patch) | |
tree | b21afcef8f711ad0fcfe57b6364716b90d5c3ffb /biometrics/fingerprint | |
parent | 0d311f86e1596d1e9fb3d1c41bbec2c248cf070d (diff) | |
parent | 6c811964a11b2edb15fc4c760e80701cc6113f3d (diff) | |
download | platform-hardware-interfaces-116161d94eca370d3054f0fe34b2c9d8acce70c4.tar.gz platform-hardware-interfaces-116161d94eca370d3054f0fe34b2c9d8acce70c4.tar.xz platform-hardware-interfaces-116161d94eca370d3054f0fe34b2c9d8acce70c4.zip |
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1
Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
Diffstat (limited to 'biometrics/fingerprint')
-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 e6e48273..16f83b4d 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp | |||
@@ -73,6 +73,42 @@ cc_library { | |||
73 | } | 73 | } |
74 | 74 | ||
75 | genrule { | 75 | genrule { |
76 | name: "android.hardware.biometrics.fingerprint-V2.1-java_gen_java", | ||
77 | tools: ["hidl-gen"], | ||
78 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", | ||
79 | srcs: [ | ||
80 | ":android.hardware.biometrics.fingerprint@2.1_hal", | ||
81 | ], | ||
82 | out: [ | ||
83 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.java", | ||
84 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java", | ||
85 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java", | ||
86 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java", | ||
87 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java", | ||
88 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java", | ||
89 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java", | ||
90 | "android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java", | ||
91 | "android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java", | ||
92 | "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java", | ||
93 | "android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java", | ||
94 | ], | ||
95 | } | ||
96 | |||
97 | java_library { | ||
98 | name: "android.hardware.biometrics.fingerprint-V2.1-java", | ||
99 | no_framework_libs: true, | ||
100 | defaults: ["hidl-java-module-defaults"], | ||
101 | srcs: [":android.hardware.biometrics.fingerprint-V2.1-java_gen_java"], | ||
102 | libs: [ | ||
103 | "hwbinder", | ||
104 | "android.hidl.base-V1.0-java", | ||
105 | ] | ||
106 | } | ||
107 | |||
108 | // This package does not export any types. Not creating java constants export. | ||
109 | |||
110 | |||
111 | genrule { | ||
76 | name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++", | 112 | name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper_genc++", |
77 | tools: ["hidl-gen"], | 113 | tools: ["hidl-gen"], |
78 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1", | 114 | 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 { | |||
98 | ], | 134 | ], |
99 | } | 135 | } |
100 | 136 | ||
101 | |||
102 | cc_library { | 137 | cc_library { |
103 | name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper", | 138 | name: "android.hardware.biometrics.fingerprint@2.1-adapter-helper", |
104 | defaults: ["hidl-module-defaults"], | 139 | 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 304f6a90..00000000 --- a/biometrics/fingerprint/2.1/Android.mk +++ /dev/null | |||
@@ -1,239 +0,0 @@ | |||
1 | # This file is autogenerated by hidl-gen. Do not edit manually. | ||
2 | |||
3 | LOCAL_PATH := $(call my-dir) | ||
4 | |||
5 | ################################################################################ | ||
6 | |||
7 | include $(CLEAR_VARS) | ||
8 | LOCAL_MODULE := android.hardware.biometrics.fingerprint-V2.1-java | ||
9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
10 | |||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
12 | |||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
14 | |||
15 | LOCAL_JAVA_LIBRARIES := \ | ||
16 | android.hidl.base-V1.0-java \ | ||
17 | |||
18 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
19 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
20 | |||
21 | # | ||
22 | # Build types.hal (FingerprintAcquired) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquired.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.biometrics.fingerprint@2.1::types.FingerprintAcquired | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (FingerprintAcquiredInfo) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAcquiredInfo.java | ||
44 | $(GEN): $(HIDL) | ||
45 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
46 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
47 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
48 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
49 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
50 | -Ljava \ | ||
51 | -randroid.hardware:hardware/interfaces \ | ||
52 | -randroid.hidl:system/libhidl/transport \ | ||
53 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintAcquiredInfo | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build types.hal (FingerprintAuthenticated) | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintAuthenticated.java | ||
63 | $(GEN): $(HIDL) | ||
64 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
65 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
66 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
67 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
68 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
69 | -Ljava \ | ||
70 | -randroid.hardware:hardware/interfaces \ | ||
71 | -randroid.hidl:system/libhidl/transport \ | ||
72 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintAuthenticated | ||
73 | |||
74 | $(GEN): $(LOCAL_PATH)/types.hal | ||
75 | $(transform-generated-source) | ||
76 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
77 | |||
78 | # | ||
79 | # Build types.hal (FingerprintEnroll) | ||
80 | # | ||
81 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintEnroll.java | ||
82 | $(GEN): $(HIDL) | ||
83 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
84 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
85 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
86 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
87 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
88 | -Ljava \ | ||
89 | -randroid.hardware:hardware/interfaces \ | ||
90 | -randroid.hidl:system/libhidl/transport \ | ||
91 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintEnroll | ||
92 | |||
93 | $(GEN): $(LOCAL_PATH)/types.hal | ||
94 | $(transform-generated-source) | ||
95 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
96 | |||
97 | # | ||
98 | # Build types.hal (FingerprintError) | ||
99 | # | ||
100 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintError.java | ||
101 | $(GEN): $(HIDL) | ||
102 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
103 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
104 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
105 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
106 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
107 | -Ljava \ | ||
108 | -randroid.hardware:hardware/interfaces \ | ||
109 | -randroid.hidl:system/libhidl/transport \ | ||
110 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintError | ||
111 | |||
112 | $(GEN): $(LOCAL_PATH)/types.hal | ||
113 | $(transform-generated-source) | ||
114 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
115 | |||
116 | # | ||
117 | # Build types.hal (FingerprintFingerId) | ||
118 | # | ||
119 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintFingerId.java | ||
120 | $(GEN): $(HIDL) | ||
121 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
122 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
123 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
124 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
125 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
126 | -Ljava \ | ||
127 | -randroid.hardware:hardware/interfaces \ | ||
128 | -randroid.hidl:system/libhidl/transport \ | ||
129 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintFingerId | ||
130 | |||
131 | $(GEN): $(LOCAL_PATH)/types.hal | ||
132 | $(transform-generated-source) | ||
133 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
134 | |||
135 | # | ||
136 | # Build types.hal (FingerprintIterator) | ||
137 | # | ||
138 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintIterator.java | ||
139 | $(GEN): $(HIDL) | ||
140 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
141 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
142 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
143 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
144 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
145 | -Ljava \ | ||
146 | -randroid.hardware:hardware/interfaces \ | ||
147 | -randroid.hidl:system/libhidl/transport \ | ||
148 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintIterator | ||
149 | |||
150 | $(GEN): $(LOCAL_PATH)/types.hal | ||
151 | $(transform-generated-source) | ||
152 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
153 | |||
154 | # | ||
155 | # Build types.hal (FingerprintMsgType) | ||
156 | # | ||
157 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/FingerprintMsgType.java | ||
158 | $(GEN): $(HIDL) | ||
159 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
160 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
161 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
162 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
163 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
164 | -Ljava \ | ||
165 | -randroid.hardware:hardware/interfaces \ | ||
166 | -randroid.hidl:system/libhidl/transport \ | ||
167 | android.hardware.biometrics.fingerprint@2.1::types.FingerprintMsgType | ||
168 | |||
169 | $(GEN): $(LOCAL_PATH)/types.hal | ||
170 | $(transform-generated-source) | ||
171 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
172 | |||
173 | # | ||
174 | # Build types.hal (RequestStatus) | ||
175 | # | ||
176 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/RequestStatus.java | ||
177 | $(GEN): $(HIDL) | ||
178 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
179 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
180 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
181 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
182 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
183 | -Ljava \ | ||
184 | -randroid.hardware:hardware/interfaces \ | ||
185 | -randroid.hidl:system/libhidl/transport \ | ||
186 | android.hardware.biometrics.fingerprint@2.1::types.RequestStatus | ||
187 | |||
188 | $(GEN): $(LOCAL_PATH)/types.hal | ||
189 | $(transform-generated-source) | ||
190 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
191 | |||
192 | # | ||
193 | # Build IBiometricsFingerprint.hal | ||
194 | # | ||
195 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprint.java | ||
196 | $(GEN): $(HIDL) | ||
197 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
198 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprint.hal | ||
199 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
200 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
201 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
202 | $(GEN): $(LOCAL_PATH)/types.hal | ||
203 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
204 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
205 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
206 | -Ljava \ | ||
207 | -randroid.hardware:hardware/interfaces \ | ||
208 | -randroid.hidl:system/libhidl/transport \ | ||
209 | android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprint | ||
210 | |||
211 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprint.hal | ||
212 | $(transform-generated-source) | ||
213 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
214 | |||
215 | # | ||
216 | # Build IBiometricsFingerprintClientCallback.hal | ||
217 | # | ||
218 | GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometricsFingerprintClientCallback.java | ||
219 | $(GEN): $(HIDL) | ||
220 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
221 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
222 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
223 | $(GEN): $(LOCAL_PATH)/types.hal | ||
224 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
225 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
226 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
227 | -Ljava \ | ||
228 | -randroid.hardware:hardware/interfaces \ | ||
229 | -randroid.hidl:system/libhidl/transport \ | ||
230 | android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprintClientCallback | ||
231 | |||
232 | $(GEN): $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.hal | ||
233 | $(transform-generated-source) | ||
234 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
235 | include $(BUILD_JAVA_LIBRARY) | ||
236 | |||
237 | |||
238 | |||
239 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||