diff options
28 files changed, 109 insertions, 1 deletions
diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk index eb05f35e..684055a0 100644 --- a/automotive/vehicle/2.0/Android.mk +++ b/automotive/vehicle/2.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (StatusCode) | 22 | # Build types.hal (StatusCode) |
@@ -987,6 +989,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
987 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 989 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
988 | android.hidl.base-V1.0-java-static \ | 990 | android.hidl.base-V1.0-java-static \ |
989 | 991 | ||
992 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
993 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
990 | 994 | ||
991 | # | 995 | # |
992 | # Build types.hal (StatusCode) | 996 | # Build types.hal (StatusCode) |
diff --git a/automotive/vehicle/2.1/Android.mk b/automotive/vehicle/2.1/Android.mk index 3001da05..40a15e39 100644 --- a/automotive/vehicle/2.1/Android.mk +++ b/automotive/vehicle/2.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.automotive.vehicle-V2.0-java \ | 16 | android.hardware.automotive.vehicle-V2.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build types.hal (DiagnosticFloatSensorIndex) | 23 | # Build types.hal (DiagnosticFloatSensorIndex) |
@@ -375,6 +377,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
375 | android.hardware.automotive.vehicle-V2.0-java-static \ | 377 | android.hardware.automotive.vehicle-V2.0-java-static \ |
376 | android.hidl.base-V1.0-java-static \ | 378 | android.hidl.base-V1.0-java-static \ |
377 | 379 | ||
380 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
381 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
378 | 382 | ||
379 | # | 383 | # |
380 | # Build types.hal (DiagnosticFloatSensorIndex) | 384 | # Build types.hal (DiagnosticFloatSensorIndex) |
diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk index 2f323716..395646dc 100644 --- a/biometrics/fingerprint/2.1/Android.mk +++ b/biometrics/fingerprint/2.1/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (FingerprintAcquired) | 22 | # Build types.hal (FingerprintAcquired) |
@@ -246,6 +248,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
246 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 248 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
247 | android.hidl.base-V1.0-java-static \ | 249 | android.hidl.base-V1.0-java-static \ |
248 | 250 | ||
251 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
252 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
249 | 253 | ||
250 | # | 254 | # |
251 | # Build types.hal (FingerprintAcquired) | 255 | # Build types.hal (FingerprintAcquired) |
diff --git a/camera/common/1.0/Android.mk b/camera/common/1.0/Android.mk index 47bfb31b..be2ac92b 100644 --- a/camera/common/1.0/Android.mk +++ b/camera/common/1.0/Android.mk | |||
@@ -11,6 +11,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | 11 | intermediates := $(call local-generated-sources-dir, COMMON) |
12 | 12 | ||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
14 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
15 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
14 | 16 | ||
15 | # | 17 | # |
16 | # Build types.hal (CameraDeviceStatus) | 18 | # Build types.hal (CameraDeviceStatus) |
@@ -194,6 +196,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
194 | intermediates := $(call local-generated-sources-dir, COMMON) | 196 | intermediates := $(call local-generated-sources-dir, COMMON) |
195 | 197 | ||
196 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 198 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
199 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
200 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
197 | 201 | ||
198 | # | 202 | # |
199 | # Build types.hal (CameraDeviceStatus) | 203 | # Build types.hal (CameraDeviceStatus) |
diff --git a/camera/metadata/3.2/Android.mk b/camera/metadata/3.2/Android.mk index 935c37cd..b72fe36c 100644 --- a/camera/metadata/3.2/Android.mk +++ b/camera/metadata/3.2/Android.mk | |||
@@ -11,6 +11,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | 11 | intermediates := $(call local-generated-sources-dir, COMMON) |
12 | 12 | ||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
14 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
15 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
14 | 16 | ||
15 | # | 17 | # |
16 | # Build types.hal (CameraMetadataEnumAndroidBlackLevelLock) | 18 | # Build types.hal (CameraMetadataEnumAndroidBlackLevelLock) |
@@ -1239,6 +1241,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
1239 | intermediates := $(call local-generated-sources-dir, COMMON) | 1241 | intermediates := $(call local-generated-sources-dir, COMMON) |
1240 | 1242 | ||
1241 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 1243 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
1244 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
1245 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
1242 | 1246 | ||
1243 | # | 1247 | # |
1244 | # Build types.hal (CameraMetadataEnumAndroidBlackLevelLock) | 1248 | # Build types.hal (CameraMetadataEnumAndroidBlackLevelLock) |
diff --git a/configstore/1.1/Android.mk b/configstore/1.1/Android.mk index a5fa6c47..59dfb7ea 100644 --- a/configstore/1.1/Android.mk +++ b/configstore/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.configstore-V1.0-java \ | 16 | android.hardware.configstore-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build ISurfaceFlingerConfigs.hal | 23 | # Build ISurfaceFlingerConfigs.hal |
@@ -52,6 +54,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
52 | android.hardware.configstore-V1.0-java-static \ | 54 | android.hardware.configstore-V1.0-java-static \ |
53 | android.hidl.base-V1.0-java-static \ | 55 | android.hidl.base-V1.0-java-static \ |
54 | 56 | ||
57 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
58 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
55 | 59 | ||
56 | # | 60 | # |
57 | # Build ISurfaceFlingerConfigs.hal | 61 | # Build ISurfaceFlingerConfigs.hal |
diff --git a/contexthub/1.0/Android.mk b/contexthub/1.0/Android.mk index d161e3b0..241bd8ff 100644 --- a/contexthub/1.0/Android.mk +++ b/contexthub/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (AsyncEventType) | 22 | # Build types.hal (AsyncEventType) |
@@ -341,6 +343,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
341 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 343 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
342 | android.hidl.base-V1.0-java-static \ | 344 | android.hidl.base-V1.0-java-static \ |
343 | 345 | ||
346 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
347 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
344 | 348 | ||
345 | # | 349 | # |
346 | # Build types.hal (AsyncEventType) | 350 | # Build types.hal (AsyncEventType) |
diff --git a/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk index 576f729a..8849ae5e 100644 --- a/gatekeeper/1.0/Android.mk +++ b/gatekeeper/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (GatekeeperResponse) | 22 | # Build types.hal (GatekeeperResponse) |
@@ -90,6 +92,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
90 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 92 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
91 | android.hidl.base-V1.0-java-static \ | 93 | android.hidl.base-V1.0-java-static \ |
92 | 94 | ||
95 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
96 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
93 | 97 | ||
94 | # | 98 | # |
95 | # Build types.hal (GatekeeperResponse) | 99 | # Build types.hal (GatekeeperResponse) |
diff --git a/gnss/1.0/Android.mk b/gnss/1.0/Android.mk index bb1b765d..30f0b804 100644 --- a/gnss/1.0/Android.mk +++ b/gnss/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (GnssConstellationType) | 22 | # Build types.hal (GnssConstellationType) |
@@ -537,6 +539,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
537 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 539 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
538 | android.hidl.base-V1.0-java-static \ | 540 | android.hidl.base-V1.0-java-static \ |
539 | 541 | ||
542 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
543 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
540 | 544 | ||
541 | # | 545 | # |
542 | # Build types.hal (GnssConstellationType) | 546 | # Build types.hal (GnssConstellationType) |
diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk index 569a5f44..ff7195b7 100644 --- a/graphics/common/1.0/Android.mk +++ b/graphics/common/1.0/Android.mk | |||
@@ -11,6 +11,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | 11 | intermediates := $(call local-generated-sources-dir, COMMON) |
12 | 12 | ||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
14 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
15 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
14 | 16 | ||
15 | # | 17 | # |
16 | # Build types.hal (BufferUsage) | 18 | # Build types.hal (BufferUsage) |
@@ -156,6 +158,8 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES | |||
156 | intermediates := $(call local-generated-sources-dir, COMMON) | 158 | intermediates := $(call local-generated-sources-dir, COMMON) |
157 | 159 | ||
158 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 160 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
161 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
162 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
159 | 163 | ||
160 | # | 164 | # |
161 | # Build types.hal (BufferUsage) | 165 | # Build types.hal (BufferUsage) |
diff --git a/health/1.0/Android.mk b/health/1.0/Android.mk index b03b8686..8a51da55 100644 --- a/health/1.0/Android.mk +++ b/health/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (BatteryHealth) | 22 | # Build types.hal (BatteryHealth) |
@@ -147,6 +149,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
147 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 149 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
148 | android.hidl.base-V1.0-java-static \ | 150 | android.hidl.base-V1.0-java-static \ |
149 | 151 | ||
152 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
153 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
150 | 154 | ||
151 | # | 155 | # |
152 | # Build types.hal (BatteryHealth) | 156 | # Build types.hal (BatteryHealth) |
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk index 24d7ab13..926c6001 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) | |||
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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (Brightness) | 22 | # Build types.hal (Brightness) |
@@ -147,6 +149,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
147 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 149 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
148 | android.hidl.base-V1.0-java-static \ | 150 | android.hidl.base-V1.0-java-static \ |
149 | 151 | ||
152 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
153 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
150 | 154 | ||
151 | # | 155 | # |
152 | # Build types.hal (Brightness) | 156 | # Build types.hal (Brightness) |
diff --git a/memtrack/1.0/Android.mk b/memtrack/1.0/Android.mk index 8583b0ab..6a25fb8d 100644 --- a/memtrack/1.0/Android.mk +++ b/memtrack/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (MemtrackFlag) | 22 | # Build types.hal (MemtrackFlag) |
@@ -128,6 +130,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
128 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 130 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
129 | android.hidl.base-V1.0-java-static \ | 131 | android.hidl.base-V1.0-java-static \ |
130 | 132 | ||
133 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
134 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
131 | 135 | ||
132 | # | 136 | # |
133 | # Build types.hal (MemtrackFlag) | 137 | # Build types.hal (MemtrackFlag) |
diff --git a/oemlock/1.0/Android.mk b/oemlock/1.0/Android.mk index d9864414..cacfc1a7 100644 --- a/oemlock/1.0/Android.mk +++ b/oemlock/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (OemLockSecureStatus) | 22 | # Build types.hal (OemLockSecureStatus) |
@@ -90,6 +92,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
90 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 92 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
91 | android.hidl.base-V1.0-java-static \ | 93 | android.hidl.base-V1.0-java-static \ |
92 | 94 | ||
95 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
96 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
93 | 97 | ||
94 | # | 98 | # |
95 | # Build types.hal (OemLockSecureStatus) | 99 | # Build types.hal (OemLockSecureStatus) |
diff --git a/power/1.0/Android.mk b/power/1.0/Android.mk index 8a89a452..96d72d94 100644 --- a/power/1.0/Android.mk +++ b/power/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (Feature) | 22 | # Build types.hal (Feature) |
@@ -147,6 +149,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
147 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 149 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
148 | android.hidl.base-V1.0-java-static \ | 150 | android.hidl.base-V1.0-java-static \ |
149 | 151 | ||
152 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
153 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
150 | 154 | ||
151 | # | 155 | # |
152 | # Build types.hal (Feature) | 156 | # Build types.hal (Feature) |
diff --git a/power/1.1/Android.mk b/power/1.1/Android.mk index 16cfcbd4..9320f06e 100644 --- a/power/1.1/Android.mk +++ b/power/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.power-V1.0-java \ | 16 | android.hardware.power-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build types.hal (PowerStateSubsystem) | 23 | # Build types.hal (PowerStateSubsystem) |
@@ -92,6 +94,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
92 | android.hardware.power-V1.0-java-static \ | 94 | android.hardware.power-V1.0-java-static \ |
93 | android.hidl.base-V1.0-java-static \ | 95 | android.hidl.base-V1.0-java-static \ |
94 | 96 | ||
97 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
98 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
95 | 99 | ||
96 | # | 100 | # |
97 | # Build types.hal (PowerStateSubsystem) | 101 | # Build types.hal (PowerStateSubsystem) |
diff --git a/tests/extension/light/2.0/Android.mk b/tests/extension/light/2.0/Android.mk index f1e10e47..4311502b 100644 --- a/tests/extension/light/2.0/Android.mk +++ b/tests/extension/light/2.0/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.light-V2.0-java \ | 16 | android.hardware.light-V2.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build types.hal (Default) | 23 | # Build types.hal (Default) |
@@ -111,6 +113,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
111 | android.hardware.light-V2.0-java-static \ | 113 | android.hardware.light-V2.0-java-static \ |
112 | android.hidl.base-V1.0-java-static \ | 114 | android.hidl.base-V1.0-java-static \ |
113 | 115 | ||
116 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
117 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
114 | 118 | ||
115 | # | 119 | # |
116 | # Build types.hal (Default) | 120 | # Build types.hal (Default) |
diff --git a/thermal/1.0/Android.mk b/thermal/1.0/Android.mk index 5a0a9a0a..3a3140c0 100644 --- a/thermal/1.0/Android.mk +++ b/thermal/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (CoolingDevice) | 22 | # Build types.hal (CoolingDevice) |
@@ -185,6 +187,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
185 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 187 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
186 | android.hidl.base-V1.0-java-static \ | 188 | android.hidl.base-V1.0-java-static \ |
187 | 189 | ||
190 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
191 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
188 | 192 | ||
189 | # | 193 | # |
190 | # Build types.hal (CoolingDevice) | 194 | # Build types.hal (CoolingDevice) |
diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp index 833f219e..ab44619e 100644 --- a/thermal/1.1/Android.bp +++ b/thermal/1.1/Android.bp | |||
@@ -42,7 +42,7 @@ genrule { | |||
42 | ], | 42 | ], |
43 | } | 43 | } |
44 | 44 | ||
45 | cc_library_shared { | 45 | cc_library { |
46 | name: "android.hardware.thermal@1.1", | 46 | name: "android.hardware.thermal@1.1", |
47 | defaults: ["hidl-module-defaults"], | 47 | defaults: ["hidl-module-defaults"], |
48 | generated_sources: ["android.hardware.thermal@1.1_genc++"], | 48 | generated_sources: ["android.hardware.thermal@1.1_genc++"], |
diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk index 082d65b8..21d2a496 100644 --- a/thermal/1.1/Android.mk +++ b/thermal/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.thermal-V1.0-java \ | 16 | android.hardware.thermal-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build IThermal.hal | 23 | # Build IThermal.hal |
@@ -73,6 +75,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
73 | android.hardware.thermal-V1.0-java-static \ | 75 | android.hardware.thermal-V1.0-java-static \ |
74 | android.hidl.base-V1.0-java-static \ | 76 | android.hidl.base-V1.0-java-static \ |
75 | 77 | ||
78 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
79 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
76 | 80 | ||
77 | # | 81 | # |
78 | # Build IThermal.hal | 82 | # Build IThermal.hal |
diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk index 1e3853d0..de7c0584 100644 --- a/tv/cec/1.0/Android.mk +++ b/tv/cec/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (AbortReason) | 22 | # Build types.hal (AbortReason) |
@@ -303,6 +305,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
303 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 305 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
304 | android.hidl.base-V1.0-java-static \ | 306 | android.hidl.base-V1.0-java-static \ |
305 | 307 | ||
308 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
309 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
306 | 310 | ||
307 | # | 311 | # |
308 | # Build types.hal (AbortReason) | 312 | # Build types.hal (AbortReason) |
diff --git a/usb/1.0/Android.mk b/usb/1.0/Android.mk index 62f69354..a293cc9b 100644 --- a/usb/1.0/Android.mk +++ b/usb/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (PortDataRole) | 22 | # Build types.hal (PortDataRole) |
@@ -208,6 +210,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
208 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 210 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
209 | android.hidl.base-V1.0-java-static \ | 211 | android.hidl.base-V1.0-java-static \ |
210 | 212 | ||
213 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
214 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
211 | 215 | ||
212 | # | 216 | # |
213 | # Build types.hal (PortDataRole) | 217 | # Build types.hal (PortDataRole) |
diff --git a/usb/1.1/Android.mk b/usb/1.1/Android.mk index 12d306b9..938390bc 100644 --- a/usb/1.1/Android.mk +++ b/usb/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.usb-V1.0-java \ | 16 | android.hardware.usb-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build types.hal (PortMode_1_1) | 23 | # Build types.hal (PortMode_1_1) |
@@ -111,6 +113,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
111 | android.hardware.usb-V1.0-java-static \ | 113 | android.hardware.usb-V1.0-java-static \ |
112 | android.hidl.base-V1.0-java-static \ | 114 | android.hidl.base-V1.0-java-static \ |
113 | 115 | ||
116 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
117 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
114 | 118 | ||
115 | # | 119 | # |
116 | # Build types.hal (PortMode_1_1) | 120 | # Build types.hal (PortMode_1_1) |
diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk index c54b655a..59a7e5b4 100644 --- a/vibrator/1.0/Android.mk +++ b/vibrator/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (Effect) | 22 | # Build types.hal (Effect) |
@@ -109,6 +111,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
109 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 111 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
110 | android.hidl.base-V1.0-java-static \ | 112 | android.hidl.base-V1.0-java-static \ |
111 | 113 | ||
114 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
115 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
112 | 116 | ||
113 | # | 117 | # |
114 | # Build types.hal (Effect) | 118 | # Build types.hal (Effect) |
diff --git a/vibrator/1.1/Android.mk b/vibrator/1.1/Android.mk index 2344e914..024631f1 100644 --- a/vibrator/1.1/Android.mk +++ b/vibrator/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.vibrator-V1.0-java \ | 16 | android.hardware.vibrator-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build types.hal (Effect_1_1) | 23 | # Build types.hal (Effect_1_1) |
@@ -73,6 +75,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
73 | android.hardware.vibrator-V1.0-java-static \ | 75 | android.hardware.vibrator-V1.0-java-static \ |
74 | android.hidl.base-V1.0-java-static \ | 76 | android.hidl.base-V1.0-java-static \ |
75 | 77 | ||
78 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
79 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
76 | 80 | ||
77 | # | 81 | # |
78 | # Build types.hal (Effect_1_1) | 82 | # Build types.hal (Effect_1_1) |
diff --git a/vr/1.0/Android.mk b/vr/1.0/Android.mk index fc5c675d..c378b95d 100644 --- a/vr/1.0/Android.mk +++ b/vr/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build IVr.hal | 22 | # Build IVr.hal |
@@ -50,6 +52,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
50 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 52 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
51 | android.hidl.base-V1.0-java-static \ | 53 | android.hidl.base-V1.0-java-static \ |
52 | 54 | ||
55 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
56 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
53 | 57 | ||
54 | # | 58 | # |
55 | # Build IVr.hal | 59 | # Build IVr.hal |
diff --git a/weaver/1.0/Android.mk b/weaver/1.0/Android.mk index 7f35b4e2..87aecfd2 100644 --- a/weaver/1.0/Android.mk +++ b/weaver/1.0/Android.mk | |||
@@ -15,6 +15,8 @@ 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 | ||
18 | 20 | ||
19 | # | 21 | # |
20 | # Build types.hal (WeaverConfig) | 22 | # Build types.hal (WeaverConfig) |
@@ -128,6 +130,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | |||
128 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 130 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
129 | android.hidl.base-V1.0-java-static \ | 131 | android.hidl.base-V1.0-java-static \ |
130 | 132 | ||
133 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
134 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
131 | 135 | ||
132 | # | 136 | # |
133 | # Build types.hal (WeaverConfig) | 137 | # Build types.hal (WeaverConfig) |
diff --git a/wifi/1.1/Android.mk b/wifi/1.1/Android.mk index fbc79ca1..637243c8 100644 --- a/wifi/1.1/Android.mk +++ b/wifi/1.1/Android.mk | |||
@@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ | |||
16 | android.hardware.wifi-V1.0-java \ | 16 | android.hardware.wifi-V1.0-java \ |
17 | android.hidl.base-V1.0-java \ | 17 | android.hidl.base-V1.0-java \ |
18 | 18 | ||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
19 | 21 | ||
20 | # | 22 | # |
21 | # Build IWifi.hal | 23 | # Build IWifi.hal |
@@ -71,6 +73,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ | |||
71 | android.hardware.wifi-V1.0-java-static \ | 73 | android.hardware.wifi-V1.0-java-static \ |
72 | android.hidl.base-V1.0-java-static \ | 74 | android.hidl.base-V1.0-java-static \ |
73 | 75 | ||
76 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
77 | LOCAL_JAVA_LIBRARIES := core-oj hwbinder | ||
74 | 78 | ||
75 | # | 79 | # |
76 | # Build IWifi.hal | 80 | # Build IWifi.hal |