diff options
32 files changed, 655 insertions, 2270 deletions
diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp index da68c2a5..fa5fac09 100644 --- a/automotive/evs/1.0/Android.bp +++ b/automotive/evs/1.0/Android.bp | |||
@@ -86,6 +86,11 @@ cc_library { | |||
86 | ], | 86 | ], |
87 | } | 87 | } |
88 | 88 | ||
89 | // This package is not java compatible. Not creating java target. | ||
90 | |||
91 | // This package does not export any types. Not creating java constants export. | ||
92 | |||
93 | |||
89 | genrule { | 94 | genrule { |
90 | name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++", | 95 | name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++", |
91 | tools: ["hidl-gen"], | 96 | tools: ["hidl-gen"], |
@@ -116,7 +121,6 @@ genrule { | |||
116 | ], | 121 | ], |
117 | } | 122 | } |
118 | 123 | ||
119 | |||
120 | cc_library { | 124 | cc_library { |
121 | name: "android.hardware.automotive.evs@1.0-adapter-helper", | 125 | name: "android.hardware.automotive.evs@1.0-adapter-helper", |
122 | defaults: ["hidl-module-defaults"], | 126 | defaults: ["hidl-module-defaults"], |
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 0d0d28f9..10f99b1e 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp | |||
@@ -73,6 +73,97 @@ cc_library { | |||
73 | } | 73 | } |
74 | 74 | ||
75 | genrule { | 75 | genrule { |
76 | name: "android.hardware.automotive.vehicle-V2.0-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.automotive.vehicle@2.0", | ||
79 | srcs: [ | ||
80 | ":android.hardware.automotive.vehicle@2.0_hal", | ||
81 | ], | ||
82 | out: [ | ||
83 | "android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java", | ||
84 | "android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java", | ||
85 | "android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java", | ||
86 | "android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java", | ||
87 | "android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java", | ||
88 | "android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java", | ||
89 | "android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java", | ||
90 | "android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java", | ||
91 | "android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java", | ||
92 | "android/hardware/automotive/vehicle/V2_0/StatusCode.java", | ||
93 | "android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java", | ||
94 | "android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java", | ||
95 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java", | ||
96 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java", | ||
97 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java", | ||
98 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java", | ||
99 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java", | ||
100 | "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java", | ||
101 | "android/hardware/automotive/vehicle/V2_0/VehicleArea.java", | ||
102 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java", | ||
103 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java", | ||
104 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java", | ||
105 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java", | ||
106 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java", | ||
107 | "android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java", | ||
108 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java", | ||
109 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java", | ||
110 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java", | ||
111 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java", | ||
112 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java", | ||
113 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java", | ||
114 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java", | ||
115 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java", | ||
116 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java", | ||
117 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java", | ||
118 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java", | ||
119 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java", | ||
120 | "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java", | ||
121 | "android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java", | ||
122 | "android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java", | ||
123 | "android/hardware/automotive/vehicle/V2_0/VehicleGear.java", | ||
124 | "android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java", | ||
125 | "android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java", | ||
126 | "android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java", | ||
127 | "android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java", | ||
128 | "android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java", | ||
129 | "android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java", | ||
130 | "android/hardware/automotive/vehicle/V2_0/VehicleProperty.java", | ||
131 | "android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java", | ||
132 | "android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java", | ||
133 | "android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java", | ||
134 | "android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java", | ||
135 | "android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java", | ||
136 | "android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java", | ||
137 | "android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java", | ||
138 | "android/hardware/automotive/vehicle/V2_0/VehicleUnit.java", | ||
139 | "android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java", | ||
140 | "android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java", | ||
141 | "android/hardware/automotive/vehicle/V2_0/VmsMessageType.java", | ||
142 | "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java", | ||
143 | "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java", | ||
144 | "android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java", | ||
145 | "android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java", | ||
146 | "android/hardware/automotive/vehicle/V2_0/Wheel.java", | ||
147 | "android/hardware/automotive/vehicle/V2_0/IVehicle.java", | ||
148 | "android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java", | ||
149 | ], | ||
150 | } | ||
151 | |||
152 | java_library { | ||
153 | name: "android.hardware.automotive.vehicle-V2.0-java", | ||
154 | no_framework_libs: true, | ||
155 | defaults: ["hidl-java-module-defaults"], | ||
156 | srcs: [":android.hardware.automotive.vehicle-V2.0-java_gen_java"], | ||
157 | libs: [ | ||
158 | "hwbinder", | ||
159 | "android.hidl.base-V1.0-java", | ||
160 | ] | ||
161 | } | ||
162 | |||
163 | // This package does not export any types. Not creating java constants export. | ||
164 | |||
165 | |||
166 | genrule { | ||
76 | name: "android.hardware.automotive.vehicle@2.0-adapter-helper_genc++", | 167 | name: "android.hardware.automotive.vehicle@2.0-adapter-helper_genc++", |
77 | tools: ["hidl-gen"], | 168 | tools: ["hidl-gen"], |
78 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", | 169 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0", |
@@ -98,7 +189,6 @@ genrule { | |||
98 | ], | 189 | ], |
99 | } | 190 | } |
100 | 191 | ||
101 | |||
102 | cc_library { | 192 | cc_library { |
103 | name: "android.hardware.automotive.vehicle@2.0-adapter-helper", | 193 | name: "android.hardware.automotive.vehicle@2.0-adapter-helper", |
104 | defaults: ["hidl-module-defaults"], | 194 | defaults: ["hidl-module-defaults"], |
diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk deleted file mode 100644 index ec18766a..00000000 --- a/automotive/vehicle/2.0/Android.mk +++ /dev/null | |||
@@ -1,1284 +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.automotive.vehicle-V2.0-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 (DiagnosticFloatSensorIndex) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.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.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (DiagnosticIntegerSensorIndex) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.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.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build types.hal (Obd2CommonIgnitionMonitors) | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors | ||
73 | |||
74 | $(GEN): $(LOCAL_PATH)/types.hal | ||
75 | $(transform-generated-source) | ||
76 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
77 | |||
78 | # | ||
79 | # Build types.hal (Obd2CompressionIgnitionMonitors) | ||
80 | # | ||
81 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors | ||
92 | |||
93 | $(GEN): $(LOCAL_PATH)/types.hal | ||
94 | $(transform-generated-source) | ||
95 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
96 | |||
97 | # | ||
98 | # Build types.hal (Obd2FuelSystemStatus) | ||
99 | # | ||
100 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.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.automotive.vehicle@2.0::types.Obd2FuelSystemStatus | ||
111 | |||
112 | $(GEN): $(LOCAL_PATH)/types.hal | ||
113 | $(transform-generated-source) | ||
114 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
115 | |||
116 | # | ||
117 | # Build types.hal (Obd2FuelType) | ||
118 | # | ||
119 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.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.automotive.vehicle@2.0::types.Obd2FuelType | ||
130 | |||
131 | $(GEN): $(LOCAL_PATH)/types.hal | ||
132 | $(transform-generated-source) | ||
133 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
134 | |||
135 | # | ||
136 | # Build types.hal (Obd2IgnitionMonitorKind) | ||
137 | # | ||
138 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.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.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind | ||
149 | |||
150 | $(GEN): $(LOCAL_PATH)/types.hal | ||
151 | $(transform-generated-source) | ||
152 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
153 | |||
154 | # | ||
155 | # Build types.hal (Obd2SecondaryAirStatus) | ||
156 | # | ||
157 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.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.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus | ||
168 | |||
169 | $(GEN): $(LOCAL_PATH)/types.hal | ||
170 | $(transform-generated-source) | ||
171 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
172 | |||
173 | # | ||
174 | # Build types.hal (Obd2SparkIgnitionMonitors) | ||
175 | # | ||
176 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors | ||
187 | |||
188 | $(GEN): $(LOCAL_PATH)/types.hal | ||
189 | $(transform-generated-source) | ||
190 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
191 | |||
192 | # | ||
193 | # Build types.hal (StatusCode) | ||
194 | # | ||
195 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.java | ||
196 | $(GEN): $(HIDL) | ||
197 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
198 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
199 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
200 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
201 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
202 | -Ljava \ | ||
203 | -randroid.hardware:hardware/interfaces \ | ||
204 | -randroid.hidl:system/libhidl/transport \ | ||
205 | android.hardware.automotive.vehicle@2.0::types.StatusCode | ||
206 | |||
207 | $(GEN): $(LOCAL_PATH)/types.hal | ||
208 | $(transform-generated-source) | ||
209 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
210 | |||
211 | # | ||
212 | # Build types.hal (SubscribeFlags) | ||
213 | # | ||
214 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java | ||
215 | $(GEN): $(HIDL) | ||
216 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
217 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
218 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
219 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
220 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
221 | -Ljava \ | ||
222 | -randroid.hardware:hardware/interfaces \ | ||
223 | -randroid.hidl:system/libhidl/transport \ | ||
224 | android.hardware.automotive.vehicle@2.0::types.SubscribeFlags | ||
225 | |||
226 | $(GEN): $(LOCAL_PATH)/types.hal | ||
227 | $(transform-generated-source) | ||
228 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
229 | |||
230 | # | ||
231 | # Build types.hal (SubscribeOptions) | ||
232 | # | ||
233 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java | ||
234 | $(GEN): $(HIDL) | ||
235 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
236 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
237 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
238 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
239 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
240 | -Ljava \ | ||
241 | -randroid.hardware:hardware/interfaces \ | ||
242 | -randroid.hidl:system/libhidl/transport \ | ||
243 | android.hardware.automotive.vehicle@2.0::types.SubscribeOptions | ||
244 | |||
245 | $(GEN): $(LOCAL_PATH)/types.hal | ||
246 | $(transform-generated-source) | ||
247 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
248 | |||
249 | # | ||
250 | # Build types.hal (VehicleApPowerBootupReason) | ||
251 | # | ||
252 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java | ||
253 | $(GEN): $(HIDL) | ||
254 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
255 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
256 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
257 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
258 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
259 | -Ljava \ | ||
260 | -randroid.hardware:hardware/interfaces \ | ||
261 | -randroid.hidl:system/libhidl/transport \ | ||
262 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerBootupReason | ||
263 | |||
264 | $(GEN): $(LOCAL_PATH)/types.hal | ||
265 | $(transform-generated-source) | ||
266 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
267 | |||
268 | # | ||
269 | # Build types.hal (VehicleApPowerSetState) | ||
270 | # | ||
271 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java | ||
272 | $(GEN): $(HIDL) | ||
273 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
274 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
275 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
276 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
277 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
278 | -Ljava \ | ||
279 | -randroid.hardware:hardware/interfaces \ | ||
280 | -randroid.hidl:system/libhidl/transport \ | ||
281 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerSetState | ||
282 | |||
283 | $(GEN): $(LOCAL_PATH)/types.hal | ||
284 | $(transform-generated-source) | ||
285 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
286 | |||
287 | # | ||
288 | # Build types.hal (VehicleApPowerState) | ||
289 | # | ||
290 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java | ||
291 | $(GEN): $(HIDL) | ||
292 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
293 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
294 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
295 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
296 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
297 | -Ljava \ | ||
298 | -randroid.hardware:hardware/interfaces \ | ||
299 | -randroid.hidl:system/libhidl/transport \ | ||
300 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerState | ||
301 | |||
302 | $(GEN): $(LOCAL_PATH)/types.hal | ||
303 | $(transform-generated-source) | ||
304 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
305 | |||
306 | # | ||
307 | # Build types.hal (VehicleApPowerStateConfigFlag) | ||
308 | # | ||
309 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java | ||
310 | $(GEN): $(HIDL) | ||
311 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
312 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
313 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
314 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
315 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
316 | -Ljava \ | ||
317 | -randroid.hardware:hardware/interfaces \ | ||
318 | -randroid.hidl:system/libhidl/transport \ | ||
319 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag | ||
320 | |||
321 | $(GEN): $(LOCAL_PATH)/types.hal | ||
322 | $(transform-generated-source) | ||
323 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
324 | |||
325 | # | ||
326 | # Build types.hal (VehicleApPowerStateIndex) | ||
327 | # | ||
328 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java | ||
329 | $(GEN): $(HIDL) | ||
330 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
331 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
332 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
333 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
334 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
335 | -Ljava \ | ||
336 | -randroid.hardware:hardware/interfaces \ | ||
337 | -randroid.hidl:system/libhidl/transport \ | ||
338 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateIndex | ||
339 | |||
340 | $(GEN): $(LOCAL_PATH)/types.hal | ||
341 | $(transform-generated-source) | ||
342 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
343 | |||
344 | # | ||
345 | # Build types.hal (VehicleApPowerStateShutdownParam) | ||
346 | # | ||
347 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java | ||
348 | $(GEN): $(HIDL) | ||
349 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
350 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
351 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
352 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
353 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
354 | -Ljava \ | ||
355 | -randroid.hardware:hardware/interfaces \ | ||
356 | -randroid.hidl:system/libhidl/transport \ | ||
357 | android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam | ||
358 | |||
359 | $(GEN): $(LOCAL_PATH)/types.hal | ||
360 | $(transform-generated-source) | ||
361 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
362 | |||
363 | # | ||
364 | # Build types.hal (VehicleArea) | ||
365 | # | ||
366 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.java | ||
367 | $(GEN): $(HIDL) | ||
368 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
369 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
370 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
371 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
372 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
373 | -Ljava \ | ||
374 | -randroid.hardware:hardware/interfaces \ | ||
375 | -randroid.hidl:system/libhidl/transport \ | ||
376 | android.hardware.automotive.vehicle@2.0::types.VehicleArea | ||
377 | |||
378 | $(GEN): $(LOCAL_PATH)/types.hal | ||
379 | $(transform-generated-source) | ||
380 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
381 | |||
382 | # | ||
383 | # Build types.hal (VehicleAreaConfig) | ||
384 | # | ||
385 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java | ||
386 | $(GEN): $(HIDL) | ||
387 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
388 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
389 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
390 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
391 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
392 | -Ljava \ | ||
393 | -randroid.hardware:hardware/interfaces \ | ||
394 | -randroid.hidl:system/libhidl/transport \ | ||
395 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaConfig | ||
396 | |||
397 | $(GEN): $(LOCAL_PATH)/types.hal | ||
398 | $(transform-generated-source) | ||
399 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
400 | |||
401 | # | ||
402 | # Build types.hal (VehicleAreaDoor) | ||
403 | # | ||
404 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java | ||
405 | $(GEN): $(HIDL) | ||
406 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
407 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
408 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
409 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
410 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
411 | -Ljava \ | ||
412 | -randroid.hardware:hardware/interfaces \ | ||
413 | -randroid.hidl:system/libhidl/transport \ | ||
414 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaDoor | ||
415 | |||
416 | $(GEN): $(LOCAL_PATH)/types.hal | ||
417 | $(transform-generated-source) | ||
418 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
419 | |||
420 | # | ||
421 | # Build types.hal (VehicleAreaMirror) | ||
422 | # | ||
423 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java | ||
424 | $(GEN): $(HIDL) | ||
425 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
426 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
427 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
428 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
429 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
430 | -Ljava \ | ||
431 | -randroid.hardware:hardware/interfaces \ | ||
432 | -randroid.hidl:system/libhidl/transport \ | ||
433 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaMirror | ||
434 | |||
435 | $(GEN): $(LOCAL_PATH)/types.hal | ||
436 | $(transform-generated-source) | ||
437 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
438 | |||
439 | # | ||
440 | # Build types.hal (VehicleAreaSeat) | ||
441 | # | ||
442 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java | ||
443 | $(GEN): $(HIDL) | ||
444 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
445 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
446 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
447 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
448 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
449 | -Ljava \ | ||
450 | -randroid.hardware:hardware/interfaces \ | ||
451 | -randroid.hidl:system/libhidl/transport \ | ||
452 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaSeat | ||
453 | |||
454 | $(GEN): $(LOCAL_PATH)/types.hal | ||
455 | $(transform-generated-source) | ||
456 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
457 | |||
458 | # | ||
459 | # Build types.hal (VehicleAreaWindow) | ||
460 | # | ||
461 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java | ||
462 | $(GEN): $(HIDL) | ||
463 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
464 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
465 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
466 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
467 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
468 | -Ljava \ | ||
469 | -randroid.hardware:hardware/interfaces \ | ||
470 | -randroid.hidl:system/libhidl/transport \ | ||
471 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaWindow | ||
472 | |||
473 | $(GEN): $(LOCAL_PATH)/types.hal | ||
474 | $(transform-generated-source) | ||
475 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
476 | |||
477 | # | ||
478 | # Build types.hal (VehicleAreaZone) | ||
479 | # | ||
480 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java | ||
481 | $(GEN): $(HIDL) | ||
482 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
483 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
484 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
485 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
486 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
487 | -Ljava \ | ||
488 | -randroid.hardware:hardware/interfaces \ | ||
489 | -randroid.hidl:system/libhidl/transport \ | ||
490 | android.hardware.automotive.vehicle@2.0::types.VehicleAreaZone | ||
491 | |||
492 | $(GEN): $(LOCAL_PATH)/types.hal | ||
493 | $(transform-generated-source) | ||
494 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
495 | |||
496 | # | ||
497 | # Build types.hal (VehicleAudioContextFlag) | ||
498 | # | ||
499 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java | ||
500 | $(GEN): $(HIDL) | ||
501 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
502 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
503 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
504 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
505 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
506 | -Ljava \ | ||
507 | -randroid.hardware:hardware/interfaces \ | ||
508 | -randroid.hidl:system/libhidl/transport \ | ||
509 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioContextFlag | ||
510 | |||
511 | $(GEN): $(LOCAL_PATH)/types.hal | ||
512 | $(transform-generated-source) | ||
513 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
514 | |||
515 | # | ||
516 | # Build types.hal (VehicleAudioExtFocusFlag) | ||
517 | # | ||
518 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java | ||
519 | $(GEN): $(HIDL) | ||
520 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
521 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
522 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
523 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
524 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
525 | -Ljava \ | ||
526 | -randroid.hardware:hardware/interfaces \ | ||
527 | -randroid.hidl:system/libhidl/transport \ | ||
528 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag | ||
529 | |||
530 | $(GEN): $(LOCAL_PATH)/types.hal | ||
531 | $(transform-generated-source) | ||
532 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
533 | |||
534 | # | ||
535 | # Build types.hal (VehicleAudioFocusIndex) | ||
536 | # | ||
537 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java | ||
538 | $(GEN): $(HIDL) | ||
539 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
540 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
541 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
542 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
543 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
544 | -Ljava \ | ||
545 | -randroid.hardware:hardware/interfaces \ | ||
546 | -randroid.hidl:system/libhidl/transport \ | ||
547 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusIndex | ||
548 | |||
549 | $(GEN): $(LOCAL_PATH)/types.hal | ||
550 | $(transform-generated-source) | ||
551 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
552 | |||
553 | # | ||
554 | # Build types.hal (VehicleAudioFocusRequest) | ||
555 | # | ||
556 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java | ||
557 | $(GEN): $(HIDL) | ||
558 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
559 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
560 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
561 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
562 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
563 | -Ljava \ | ||
564 | -randroid.hardware:hardware/interfaces \ | ||
565 | -randroid.hidl:system/libhidl/transport \ | ||
566 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusRequest | ||
567 | |||
568 | $(GEN): $(LOCAL_PATH)/types.hal | ||
569 | $(transform-generated-source) | ||
570 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
571 | |||
572 | # | ||
573 | # Build types.hal (VehicleAudioFocusState) | ||
574 | # | ||
575 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java | ||
576 | $(GEN): $(HIDL) | ||
577 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
578 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
579 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
580 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
581 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
582 | -Ljava \ | ||
583 | -randroid.hardware:hardware/interfaces \ | ||
584 | -randroid.hidl:system/libhidl/transport \ | ||
585 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusState | ||
586 | |||
587 | $(GEN): $(LOCAL_PATH)/types.hal | ||
588 | $(transform-generated-source) | ||
589 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
590 | |||
591 | # | ||
592 | # Build types.hal (VehicleAudioHwVariantConfigFlag) | ||
593 | # | ||
594 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java | ||
595 | $(GEN): $(HIDL) | ||
596 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
597 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
598 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
599 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
600 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
601 | -Ljava \ | ||
602 | -randroid.hardware:hardware/interfaces \ | ||
603 | -randroid.hidl:system/libhidl/transport \ | ||
604 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag | ||
605 | |||
606 | $(GEN): $(LOCAL_PATH)/types.hal | ||
607 | $(transform-generated-source) | ||
608 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
609 | |||
610 | # | ||
611 | # Build types.hal (VehicleAudioRoutingPolicyIndex) | ||
612 | # | ||
613 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java | ||
614 | $(GEN): $(HIDL) | ||
615 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
616 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
617 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
618 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
619 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
620 | -Ljava \ | ||
621 | -randroid.hardware:hardware/interfaces \ | ||
622 | -randroid.hidl:system/libhidl/transport \ | ||
623 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex | ||
624 | |||
625 | $(GEN): $(LOCAL_PATH)/types.hal | ||
626 | $(transform-generated-source) | ||
627 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
628 | |||
629 | # | ||
630 | # Build types.hal (VehicleAudioStream) | ||
631 | # | ||
632 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java | ||
633 | $(GEN): $(HIDL) | ||
634 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
635 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
636 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
637 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
638 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
639 | -Ljava \ | ||
640 | -randroid.hardware:hardware/interfaces \ | ||
641 | -randroid.hidl:system/libhidl/transport \ | ||
642 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioStream | ||
643 | |||
644 | $(GEN): $(LOCAL_PATH)/types.hal | ||
645 | $(transform-generated-source) | ||
646 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
647 | |||
648 | # | ||
649 | # Build types.hal (VehicleAudioStreamFlag) | ||
650 | # | ||
651 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java | ||
652 | $(GEN): $(HIDL) | ||
653 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
654 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
655 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
656 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
657 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
658 | -Ljava \ | ||
659 | -randroid.hardware:hardware/interfaces \ | ||
660 | -randroid.hidl:system/libhidl/transport \ | ||
661 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioStreamFlag | ||
662 | |||
663 | $(GEN): $(LOCAL_PATH)/types.hal | ||
664 | $(transform-generated-source) | ||
665 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
666 | |||
667 | # | ||
668 | # Build types.hal (VehicleAudioVolumeCapabilityFlag) | ||
669 | # | ||
670 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java | ||
671 | $(GEN): $(HIDL) | ||
672 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
673 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
674 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
675 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
676 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
677 | -Ljava \ | ||
678 | -randroid.hardware:hardware/interfaces \ | ||
679 | -randroid.hidl:system/libhidl/transport \ | ||
680 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag | ||
681 | |||
682 | $(GEN): $(LOCAL_PATH)/types.hal | ||
683 | $(transform-generated-source) | ||
684 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
685 | |||
686 | # | ||
687 | # Build types.hal (VehicleAudioVolumeIndex) | ||
688 | # | ||
689 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java | ||
690 | $(GEN): $(HIDL) | ||
691 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
692 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
693 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
694 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
695 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
696 | -Ljava \ | ||
697 | -randroid.hardware:hardware/interfaces \ | ||
698 | -randroid.hidl:system/libhidl/transport \ | ||
699 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex | ||
700 | |||
701 | $(GEN): $(LOCAL_PATH)/types.hal | ||
702 | $(transform-generated-source) | ||
703 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
704 | |||
705 | # | ||
706 | # Build types.hal (VehicleAudioVolumeLimitIndex) | ||
707 | # | ||
708 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java | ||
709 | $(GEN): $(HIDL) | ||
710 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
711 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
712 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
713 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
714 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
715 | -Ljava \ | ||
716 | -randroid.hardware:hardware/interfaces \ | ||
717 | -randroid.hidl:system/libhidl/transport \ | ||
718 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex | ||
719 | |||
720 | $(GEN): $(LOCAL_PATH)/types.hal | ||
721 | $(transform-generated-source) | ||
722 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
723 | |||
724 | # | ||
725 | # Build types.hal (VehicleAudioVolumeState) | ||
726 | # | ||
727 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java | ||
728 | $(GEN): $(HIDL) | ||
729 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
730 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
731 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
732 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
733 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
734 | -Ljava \ | ||
735 | -randroid.hardware:hardware/interfaces \ | ||
736 | -randroid.hidl:system/libhidl/transport \ | ||
737 | android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeState | ||
738 | |||
739 | $(GEN): $(LOCAL_PATH)/types.hal | ||
740 | $(transform-generated-source) | ||
741 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
742 | |||
743 | # | ||
744 | # Build types.hal (VehicleDisplay) | ||
745 | # | ||
746 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java | ||
747 | $(GEN): $(HIDL) | ||
748 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
749 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
750 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
751 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
752 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
753 | -Ljava \ | ||
754 | -randroid.hardware:hardware/interfaces \ | ||
755 | -randroid.hidl:system/libhidl/transport \ | ||
756 | android.hardware.automotive.vehicle@2.0::types.VehicleDisplay | ||
757 | |||
758 | $(GEN): $(LOCAL_PATH)/types.hal | ||
759 | $(transform-generated-source) | ||
760 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
761 | |||
762 | # | ||
763 | # Build types.hal (VehicleDrivingStatus) | ||
764 | # | ||
765 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java | ||
766 | $(GEN): $(HIDL) | ||
767 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
768 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
769 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
770 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
771 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
772 | -Ljava \ | ||
773 | -randroid.hardware:hardware/interfaces \ | ||
774 | -randroid.hidl:system/libhidl/transport \ | ||
775 | android.hardware.automotive.vehicle@2.0::types.VehicleDrivingStatus | ||
776 | |||
777 | $(GEN): $(LOCAL_PATH)/types.hal | ||
778 | $(transform-generated-source) | ||
779 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
780 | |||
781 | # | ||
782 | # Build types.hal (VehicleGear) | ||
783 | # | ||
784 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.java | ||
785 | $(GEN): $(HIDL) | ||
786 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
787 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
788 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
789 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
790 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
791 | -Ljava \ | ||
792 | -randroid.hardware:hardware/interfaces \ | ||
793 | -randroid.hidl:system/libhidl/transport \ | ||
794 | android.hardware.automotive.vehicle@2.0::types.VehicleGear | ||
795 | |||
796 | $(GEN): $(LOCAL_PATH)/types.hal | ||
797 | $(transform-generated-source) | ||
798 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
799 | |||
800 | # | ||
801 | # Build types.hal (VehicleHvacFanDirection) | ||
802 | # | ||
803 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java | ||
804 | $(GEN): $(HIDL) | ||
805 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
806 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
807 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
808 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
809 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
810 | -Ljava \ | ||
811 | -randroid.hardware:hardware/interfaces \ | ||
812 | -randroid.hidl:system/libhidl/transport \ | ||
813 | android.hardware.automotive.vehicle@2.0::types.VehicleHvacFanDirection | ||
814 | |||
815 | $(GEN): $(LOCAL_PATH)/types.hal | ||
816 | $(transform-generated-source) | ||
817 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
818 | |||
819 | # | ||
820 | # Build types.hal (VehicleHwKeyInputAction) | ||
821 | # | ||
822 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java | ||
823 | $(GEN): $(HIDL) | ||
824 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
825 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
826 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
827 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
828 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
829 | -Ljava \ | ||
830 | -randroid.hardware:hardware/interfaces \ | ||
831 | -randroid.hidl:system/libhidl/transport \ | ||
832 | android.hardware.automotive.vehicle@2.0::types.VehicleHwKeyInputAction | ||
833 | |||
834 | $(GEN): $(LOCAL_PATH)/types.hal | ||
835 | $(transform-generated-source) | ||
836 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
837 | |||
838 | # | ||
839 | # Build types.hal (VehicleIgnitionState) | ||
840 | # | ||
841 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java | ||
842 | $(GEN): $(HIDL) | ||
843 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
844 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
845 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
846 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
847 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
848 | -Ljava \ | ||
849 | -randroid.hardware:hardware/interfaces \ | ||
850 | -randroid.hidl:system/libhidl/transport \ | ||
851 | android.hardware.automotive.vehicle@2.0::types.VehicleIgnitionState | ||
852 | |||
853 | $(GEN): $(LOCAL_PATH)/types.hal | ||
854 | $(transform-generated-source) | ||
855 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
856 | |||
857 | # | ||
858 | # Build types.hal (VehicleInstrumentClusterType) | ||
859 | # | ||
860 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java | ||
861 | $(GEN): $(HIDL) | ||
862 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
863 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
864 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
865 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
866 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
867 | -Ljava \ | ||
868 | -randroid.hardware:hardware/interfaces \ | ||
869 | -randroid.hidl:system/libhidl/transport \ | ||
870 | android.hardware.automotive.vehicle@2.0::types.VehicleInstrumentClusterType | ||
871 | |||
872 | $(GEN): $(LOCAL_PATH)/types.hal | ||
873 | $(transform-generated-source) | ||
874 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
875 | |||
876 | # | ||
877 | # Build types.hal (VehiclePropConfig) | ||
878 | # | ||
879 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java | ||
880 | $(GEN): $(HIDL) | ||
881 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
882 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
883 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
884 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
885 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
886 | -Ljava \ | ||
887 | -randroid.hardware:hardware/interfaces \ | ||
888 | -randroid.hidl:system/libhidl/transport \ | ||
889 | android.hardware.automotive.vehicle@2.0::types.VehiclePropConfig | ||
890 | |||
891 | $(GEN): $(LOCAL_PATH)/types.hal | ||
892 | $(transform-generated-source) | ||
893 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
894 | |||
895 | # | ||
896 | # Build types.hal (VehiclePropValue) | ||
897 | # | ||
898 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java | ||
899 | $(GEN): $(HIDL) | ||
900 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
901 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
902 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
903 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
904 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
905 | -Ljava \ | ||
906 | -randroid.hardware:hardware/interfaces \ | ||
907 | -randroid.hidl:system/libhidl/transport \ | ||
908 | android.hardware.automotive.vehicle@2.0::types.VehiclePropValue | ||
909 | |||
910 | $(GEN): $(LOCAL_PATH)/types.hal | ||
911 | $(transform-generated-source) | ||
912 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
913 | |||
914 | # | ||
915 | # Build types.hal (VehicleProperty) | ||
916 | # | ||
917 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.java | ||
918 | $(GEN): $(HIDL) | ||
919 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
920 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
921 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
922 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
923 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
924 | -Ljava \ | ||
925 | -randroid.hardware:hardware/interfaces \ | ||
926 | -randroid.hidl:system/libhidl/transport \ | ||
927 | android.hardware.automotive.vehicle@2.0::types.VehicleProperty | ||
928 | |||
929 | $(GEN): $(LOCAL_PATH)/types.hal | ||
930 | $(transform-generated-source) | ||
931 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
932 | |||
933 | # | ||
934 | # Build types.hal (VehiclePropertyAccess) | ||
935 | # | ||
936 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java | ||
937 | $(GEN): $(HIDL) | ||
938 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
939 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
940 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
941 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
942 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
943 | -Ljava \ | ||
944 | -randroid.hardware:hardware/interfaces \ | ||
945 | -randroid.hidl:system/libhidl/transport \ | ||
946 | android.hardware.automotive.vehicle@2.0::types.VehiclePropertyAccess | ||
947 | |||
948 | $(GEN): $(LOCAL_PATH)/types.hal | ||
949 | $(transform-generated-source) | ||
950 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
951 | |||
952 | # | ||
953 | # Build types.hal (VehiclePropertyChangeMode) | ||
954 | # | ||
955 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java | ||
956 | $(GEN): $(HIDL) | ||
957 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
958 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
959 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
960 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
961 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
962 | -Ljava \ | ||
963 | -randroid.hardware:hardware/interfaces \ | ||
964 | -randroid.hidl:system/libhidl/transport \ | ||
965 | android.hardware.automotive.vehicle@2.0::types.VehiclePropertyChangeMode | ||
966 | |||
967 | $(GEN): $(LOCAL_PATH)/types.hal | ||
968 | $(transform-generated-source) | ||
969 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
970 | |||
971 | # | ||
972 | # Build types.hal (VehiclePropertyGroup) | ||
973 | # | ||
974 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java | ||
975 | $(GEN): $(HIDL) | ||
976 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
977 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
978 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
979 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
980 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
981 | -Ljava \ | ||
982 | -randroid.hardware:hardware/interfaces \ | ||
983 | -randroid.hidl:system/libhidl/transport \ | ||
984 | android.hardware.automotive.vehicle@2.0::types.VehiclePropertyGroup | ||
985 | |||
986 | $(GEN): $(LOCAL_PATH)/types.hal | ||
987 | $(transform-generated-source) | ||
988 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
989 | |||
990 | # | ||
991 | # Build types.hal (VehiclePropertyOperation) | ||
992 | # | ||
993 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java | ||
994 | $(GEN): $(HIDL) | ||
995 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
996 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
997 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
998 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
999 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1000 | -Ljava \ | ||
1001 | -randroid.hardware:hardware/interfaces \ | ||
1002 | -randroid.hidl:system/libhidl/transport \ | ||
1003 | android.hardware.automotive.vehicle@2.0::types.VehiclePropertyOperation | ||
1004 | |||
1005 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1006 | $(transform-generated-source) | ||
1007 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1008 | |||
1009 | # | ||
1010 | # Build types.hal (VehiclePropertyType) | ||
1011 | # | ||
1012 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java | ||
1013 | $(GEN): $(HIDL) | ||
1014 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1015 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1016 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1017 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1018 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1019 | -Ljava \ | ||
1020 | -randroid.hardware:hardware/interfaces \ | ||
1021 | -randroid.hidl:system/libhidl/transport \ | ||
1022 | android.hardware.automotive.vehicle@2.0::types.VehiclePropertyType | ||
1023 | |||
1024 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1025 | $(transform-generated-source) | ||
1026 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1027 | |||
1028 | # | ||
1029 | # Build types.hal (VehicleRadioConstants) | ||
1030 | # | ||
1031 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java | ||
1032 | $(GEN): $(HIDL) | ||
1033 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1034 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1035 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1036 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1037 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1038 | -Ljava \ | ||
1039 | -randroid.hardware:hardware/interfaces \ | ||
1040 | -randroid.hidl:system/libhidl/transport \ | ||
1041 | android.hardware.automotive.vehicle@2.0::types.VehicleRadioConstants | ||
1042 | |||
1043 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1044 | $(transform-generated-source) | ||
1045 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1046 | |||
1047 | # | ||
1048 | # Build types.hal (VehicleTurnSignal) | ||
1049 | # | ||
1050 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java | ||
1051 | $(GEN): $(HIDL) | ||
1052 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1053 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1054 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1055 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1056 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1057 | -Ljava \ | ||
1058 | -randroid.hardware:hardware/interfaces \ | ||
1059 | -randroid.hidl:system/libhidl/transport \ | ||
1060 | android.hardware.automotive.vehicle@2.0::types.VehicleTurnSignal | ||
1061 | |||
1062 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1063 | $(transform-generated-source) | ||
1064 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1065 | |||
1066 | # | ||
1067 | # Build types.hal (VehicleUnit) | ||
1068 | # | ||
1069 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.java | ||
1070 | $(GEN): $(HIDL) | ||
1071 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1072 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1073 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1074 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1075 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1076 | -Ljava \ | ||
1077 | -randroid.hardware:hardware/interfaces \ | ||
1078 | -randroid.hidl:system/libhidl/transport \ | ||
1079 | android.hardware.automotive.vehicle@2.0::types.VehicleUnit | ||
1080 | |||
1081 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1082 | $(transform-generated-source) | ||
1083 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1084 | |||
1085 | # | ||
1086 | # Build types.hal (VmsAvailabilityStateIntegerValuesIndex) | ||
1087 | # | ||
1088 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java | ||
1089 | $(GEN): $(HIDL) | ||
1090 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1091 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1092 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1093 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1094 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1095 | -Ljava \ | ||
1096 | -randroid.hardware:hardware/interfaces \ | ||
1097 | -randroid.hidl:system/libhidl/transport \ | ||
1098 | android.hardware.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex | ||
1099 | |||
1100 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1101 | $(transform-generated-source) | ||
1102 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1103 | |||
1104 | # | ||
1105 | # Build types.hal (VmsBaseMessageIntegerValuesIndex) | ||
1106 | # | ||
1107 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java | ||
1108 | $(GEN): $(HIDL) | ||
1109 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1110 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1111 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1112 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1113 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1114 | -Ljava \ | ||
1115 | -randroid.hardware:hardware/interfaces \ | ||
1116 | -randroid.hidl:system/libhidl/transport \ | ||
1117 | android.hardware.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex | ||
1118 | |||
1119 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1120 | $(transform-generated-source) | ||
1121 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1122 | |||
1123 | # | ||
1124 | # Build types.hal (VmsMessageType) | ||
1125 | # | ||
1126 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java | ||
1127 | $(GEN): $(HIDL) | ||
1128 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1129 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1130 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1131 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1132 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1133 | -Ljava \ | ||
1134 | -randroid.hardware:hardware/interfaces \ | ||
1135 | -randroid.hidl:system/libhidl/transport \ | ||
1136 | android.hardware.automotive.vehicle@2.0::types.VmsMessageType | ||
1137 | |||
1138 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1139 | $(transform-generated-source) | ||
1140 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1141 | |||
1142 | # | ||
1143 | # Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex) | ||
1144 | # | ||
1145 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java | ||
1146 | $(GEN): $(HIDL) | ||
1147 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1148 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1149 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1150 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1151 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1152 | -Ljava \ | ||
1153 | -randroid.hardware:hardware/interfaces \ | ||
1154 | -randroid.hidl:system/libhidl/transport \ | ||
1155 | android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex | ||
1156 | |||
1157 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1158 | $(transform-generated-source) | ||
1159 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1160 | |||
1161 | # | ||
1162 | # Build types.hal (VmsMessageWithLayerIntegerValuesIndex) | ||
1163 | # | ||
1164 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java | ||
1165 | $(GEN): $(HIDL) | ||
1166 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1167 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1168 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1169 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1170 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1171 | -Ljava \ | ||
1172 | -randroid.hardware:hardware/interfaces \ | ||
1173 | -randroid.hidl:system/libhidl/transport \ | ||
1174 | android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex | ||
1175 | |||
1176 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1177 | $(transform-generated-source) | ||
1178 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1179 | |||
1180 | # | ||
1181 | # Build types.hal (VmsOfferingMessageIntegerValuesIndex) | ||
1182 | # | ||
1183 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java | ||
1184 | $(GEN): $(HIDL) | ||
1185 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1186 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1187 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1188 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1189 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1190 | -Ljava \ | ||
1191 | -randroid.hardware:hardware/interfaces \ | ||
1192 | -randroid.hidl:system/libhidl/transport \ | ||
1193 | android.hardware.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex | ||
1194 | |||
1195 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1196 | $(transform-generated-source) | ||
1197 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1198 | |||
1199 | # | ||
1200 | # Build types.hal (VmsSubscriptionsStateIntegerValuesIndex) | ||
1201 | # | ||
1202 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java | ||
1203 | $(GEN): $(HIDL) | ||
1204 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1205 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1206 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1207 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1208 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1209 | -Ljava \ | ||
1210 | -randroid.hardware:hardware/interfaces \ | ||
1211 | -randroid.hidl:system/libhidl/transport \ | ||
1212 | android.hardware.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex | ||
1213 | |||
1214 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1215 | $(transform-generated-source) | ||
1216 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1217 | |||
1218 | # | ||
1219 | # Build types.hal (Wheel) | ||
1220 | # | ||
1221 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.java | ||
1222 | $(GEN): $(HIDL) | ||
1223 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1224 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
1225 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1226 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1227 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1228 | -Ljava \ | ||
1229 | -randroid.hardware:hardware/interfaces \ | ||
1230 | -randroid.hidl:system/libhidl/transport \ | ||
1231 | android.hardware.automotive.vehicle@2.0::types.Wheel | ||
1232 | |||
1233 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1234 | $(transform-generated-source) | ||
1235 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1236 | |||
1237 | # | ||
1238 | # Build IVehicle.hal | ||
1239 | # | ||
1240 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java | ||
1241 | $(GEN): $(HIDL) | ||
1242 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1243 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal | ||
1244 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IVehicleCallback.hal | ||
1245 | $(GEN): $(LOCAL_PATH)/IVehicleCallback.hal | ||
1246 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
1247 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1248 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1249 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1250 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1251 | -Ljava \ | ||
1252 | -randroid.hardware:hardware/interfaces \ | ||
1253 | -randroid.hidl:system/libhidl/transport \ | ||
1254 | android.hardware.automotive.vehicle@2.0::IVehicle | ||
1255 | |||
1256 | $(GEN): $(LOCAL_PATH)/IVehicle.hal | ||
1257 | $(transform-generated-source) | ||
1258 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1259 | |||
1260 | # | ||
1261 | # Build IVehicleCallback.hal | ||
1262 | # | ||
1263 | GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java | ||
1264 | $(GEN): $(HIDL) | ||
1265 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
1266 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.hal | ||
1267 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
1268 | $(GEN): $(LOCAL_PATH)/types.hal | ||
1269 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
1270 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
1271 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
1272 | -Ljava \ | ||
1273 | -randroid.hardware:hardware/interfaces \ | ||
1274 | -randroid.hidl:system/libhidl/transport \ | ||
1275 | android.hardware.automotive.vehicle@2.0::IVehicleCallback | ||
1276 | |||
1277 | $(GEN): $(LOCAL_PATH)/IVehicleCallback.hal | ||
1278 | $(transform-generated-source) | ||
1279 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
1280 | include $(BUILD_JAVA_LIBRARY) | ||
1281 | |||
1282 | |||
1283 | |||
1284 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/broadcastradio/1.2/Android.bp b/broadcastradio/1.2/Android.bp index 44136c8a..1a7f9042 100644 --- a/broadcastradio/1.2/Android.bp +++ b/broadcastradio/1.2/Android.bp | |||
@@ -82,3 +82,96 @@ cc_library { | |||
82 | "android.hardware.broadcastradio@1.1", | 82 | "android.hardware.broadcastradio@1.1", |
83 | ], | 83 | ], |
84 | } | 84 | } |
85 | |||
86 | // This package is not java compatible. Not creating java target. | ||
87 | |||
88 | // This package does not export any types. Not creating java constants export. | ||
89 | |||
90 | |||
91 | genrule { | ||
92 | name: "android.hardware.broadcastradio@1.2-adapter-helper_genc++", | ||
93 | tools: ["hidl-gen"], | ||
94 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2", | ||
95 | srcs: [ | ||
96 | ":android.hardware.broadcastradio@1.2_hal", | ||
97 | ], | ||
98 | out: [ | ||
99 | "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.cpp", | ||
100 | "android/hardware/broadcastradio/1.2/ATuner.cpp", | ||
101 | "android/hardware/broadcastradio/1.2/ATunerCallback.cpp", | ||
102 | ], | ||
103 | } | ||
104 | |||
105 | genrule { | ||
106 | name: "android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers", | ||
107 | tools: ["hidl-gen"], | ||
108 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2", | ||
109 | srcs: [ | ||
110 | ":android.hardware.broadcastradio@1.2_hal", | ||
111 | ], | ||
112 | out: [ | ||
113 | "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.h", | ||
114 | "android/hardware/broadcastradio/1.2/ATuner.h", | ||
115 | "android/hardware/broadcastradio/1.2/ATunerCallback.h", | ||
116 | ], | ||
117 | } | ||
118 | |||
119 | cc_library { | ||
120 | name: "android.hardware.broadcastradio@1.2-adapter-helper", | ||
121 | defaults: ["hidl-module-defaults"], | ||
122 | generated_sources: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++"], | ||
123 | generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"], | ||
124 | export_generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"], | ||
125 | vendor_available: true, | ||
126 | shared_libs: [ | ||
127 | "libhidlbase", | ||
128 | "libhidltransport", | ||
129 | "libhwbinder", | ||
130 | "liblog", | ||
131 | "libutils", | ||
132 | "libcutils", | ||
133 | "libhidladapter", | ||
134 | "android.hardware.broadcastradio@1.0", | ||
135 | "android.hardware.broadcastradio@1.1", | ||
136 | "android.hardware.broadcastradio@1.2", | ||
137 | "android.hardware.broadcastradio@1.0-adapter-helper", | ||
138 | "android.hardware.broadcastradio@1.1-adapter-helper", | ||
139 | "android.hidl.base@1.0-adapter-helper", | ||
140 | ], | ||
141 | export_shared_lib_headers: [ | ||
142 | "libhidlbase", | ||
143 | "libhidltransport", | ||
144 | "libhwbinder", | ||
145 | "libutils", | ||
146 | "libhidladapter", | ||
147 | "android.hardware.broadcastradio@1.0", | ||
148 | "android.hardware.broadcastradio@1.1", | ||
149 | "android.hardware.broadcastradio@1.2", | ||
150 | "android.hardware.broadcastradio@1.0-adapter-helper", | ||
151 | "android.hardware.broadcastradio@1.1-adapter-helper", | ||
152 | "android.hidl.base@1.0-adapter-helper", | ||
153 | ], | ||
154 | } | ||
155 | |||
156 | genrule { | ||
157 | name: "android.hardware.broadcastradio@1.2-adapter_genc++", | ||
158 | tools: ["hidl-gen"], | ||
159 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2", | ||
160 | out: ["main.cpp"] | ||
161 | } | ||
162 | |||
163 | cc_test { | ||
164 | name: "android.hardware.broadcastradio@1.2-adapter", | ||
165 | defaults: ["hidl-module-defaults"], | ||
166 | shared_libs: [ | ||
167 | "libhidladapter", | ||
168 | "libhidlbase", | ||
169 | "libhidltransport", | ||
170 | "libutils", | ||
171 | "android.hardware.broadcastradio@1.0", | ||
172 | "android.hardware.broadcastradio@1.1", | ||
173 | "android.hardware.broadcastradio@1.2", | ||
174 | "android.hardware.broadcastradio@1.2-adapter-helper", | ||
175 | ], | ||
176 | generated_sources: ["android.hardware.broadcastradio@1.2-adapter_genc++"], | ||
177 | } | ||
diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp index 29b63f83..af3d7b4c 100644 --- a/camera/device/3.3/Android.bp +++ b/camera/device/3.3/Android.bp | |||
@@ -71,6 +71,11 @@ cc_library { | |||
71 | ], | 71 | ], |
72 | } | 72 | } |
73 | 73 | ||
74 | // This package is not java compatible. Not creating java target. | ||
75 | |||
76 | // This package does not export any types. Not creating java constants export. | ||
77 | |||
78 | |||
74 | genrule { | 79 | genrule { |
75 | name: "android.hardware.camera.device@3.3-adapter-helper_genc++", | 80 | name: "android.hardware.camera.device@3.3-adapter-helper_genc++", |
76 | tools: ["hidl-gen"], | 81 | tools: ["hidl-gen"], |
@@ -95,7 +100,6 @@ genrule { | |||
95 | ], | 100 | ], |
96 | } | 101 | } |
97 | 102 | ||
98 | |||
99 | cc_library { | 103 | cc_library { |
100 | name: "android.hardware.camera.device@3.3-adapter-helper", | 104 | name: "android.hardware.camera.device@3.3-adapter-helper", |
101 | defaults: ["hidl-module-defaults"], | 105 | defaults: ["hidl-module-defaults"], |
@@ -142,6 +146,7 @@ genrule { | |||
142 | 146 | ||
143 | cc_test { | 147 | cc_test { |
144 | name: "android.hardware.camera.device@3.3-adapter", | 148 | name: "android.hardware.camera.device@3.3-adapter", |
149 | defaults: ["hidl-module-defaults"], | ||
145 | shared_libs: [ | 150 | shared_libs: [ |
146 | "libhidladapter", | 151 | "libhidladapter", |
147 | "libhidlbase", | 152 | "libhidlbase", |
diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp index ea8c10ee..80610f97 100644 --- a/cas/1.0/Android.bp +++ b/cas/1.0/Android.bp | |||
@@ -87,6 +87,37 @@ cc_library { | |||
87 | } | 87 | } |
88 | 88 | ||
89 | genrule { | 89 | genrule { |
90 | name: "android.hardware.cas-V1.0-java_gen_java", | ||
91 | tools: ["hidl-gen"], | ||
92 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", | ||
93 | srcs: [ | ||
94 | ":android.hardware.cas@1.0_hal", | ||
95 | ], | ||
96 | out: [ | ||
97 | "android/hardware/cas/V1_0/HidlCasPluginDescriptor.java", | ||
98 | "android/hardware/cas/V1_0/Status.java", | ||
99 | "android/hardware/cas/V1_0/ICas.java", | ||
100 | "android/hardware/cas/V1_0/ICasListener.java", | ||
101 | "android/hardware/cas/V1_0/IDescramblerBase.java", | ||
102 | "android/hardware/cas/V1_0/IMediaCasService.java", | ||
103 | ], | ||
104 | } | ||
105 | |||
106 | java_library { | ||
107 | name: "android.hardware.cas-V1.0-java", | ||
108 | no_framework_libs: true, | ||
109 | defaults: ["hidl-java-module-defaults"], | ||
110 | srcs: [":android.hardware.cas-V1.0-java_gen_java"], | ||
111 | libs: [ | ||
112 | "hwbinder", | ||
113 | "android.hidl.base-V1.0-java", | ||
114 | ] | ||
115 | } | ||
116 | |||
117 | // This package does not export any types. Not creating java constants export. | ||
118 | |||
119 | |||
120 | genrule { | ||
90 | name: "android.hardware.cas@1.0-adapter-helper_genc++", | 121 | name: "android.hardware.cas@1.0-adapter-helper_genc++", |
91 | tools: ["hidl-gen"], | 122 | tools: ["hidl-gen"], |
92 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", | 123 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", |
@@ -116,7 +147,6 @@ genrule { | |||
116 | ], | 147 | ], |
117 | } | 148 | } |
118 | 149 | ||
119 | |||
120 | cc_library { | 150 | cc_library { |
121 | name: "android.hardware.cas@1.0-adapter-helper", | 151 | name: "android.hardware.cas@1.0-adapter-helper", |
122 | defaults: ["hidl-module-defaults"], | 152 | defaults: ["hidl-module-defaults"], |
@@ -155,6 +185,7 @@ genrule { | |||
155 | 185 | ||
156 | cc_test { | 186 | cc_test { |
157 | name: "android.hardware.cas@1.0-adapter", | 187 | name: "android.hardware.cas@1.0-adapter", |
188 | defaults: ["hidl-module-defaults"], | ||
158 | shared_libs: [ | 189 | shared_libs: [ |
159 | "libhidladapter", | 190 | "libhidladapter", |
160 | "libhidlbase", | 191 | "libhidlbase", |
diff --git a/cas/1.0/Android.mk b/cas/1.0/Android.mk deleted file mode 100644 index 1ff2b04d..00000000 --- a/cas/1.0/Android.mk +++ /dev/null | |||
@@ -1,150 +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.cas-V1.0-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 (HidlCasPluginDescriptor) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/cas/V1_0/HidlCasPluginDescriptor.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.cas@1.0::types.HidlCasPluginDescriptor | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (Status) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/cas/V1_0/Status.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.cas@1.0::types.Status | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build ICas.hal | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/cas/V1_0/ICas.java | ||
63 | $(GEN): $(HIDL) | ||
64 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
65 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ICas.hal | ||
66 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
67 | $(GEN): $(LOCAL_PATH)/types.hal | ||
68 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
69 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
70 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
71 | -Ljava \ | ||
72 | -randroid.hardware:hardware/interfaces \ | ||
73 | -randroid.hidl:system/libhidl/transport \ | ||
74 | android.hardware.cas@1.0::ICas | ||
75 | |||
76 | $(GEN): $(LOCAL_PATH)/ICas.hal | ||
77 | $(transform-generated-source) | ||
78 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
79 | |||
80 | # | ||
81 | # Build ICasListener.hal | ||
82 | # | ||
83 | GEN := $(intermediates)/android/hardware/cas/V1_0/ICasListener.java | ||
84 | $(GEN): $(HIDL) | ||
85 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
86 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ICasListener.hal | ||
87 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
88 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
89 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
90 | -Ljava \ | ||
91 | -randroid.hardware:hardware/interfaces \ | ||
92 | -randroid.hidl:system/libhidl/transport \ | ||
93 | android.hardware.cas@1.0::ICasListener | ||
94 | |||
95 | $(GEN): $(LOCAL_PATH)/ICasListener.hal | ||
96 | $(transform-generated-source) | ||
97 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
98 | |||
99 | # | ||
100 | # Build IDescramblerBase.hal | ||
101 | # | ||
102 | GEN := $(intermediates)/android/hardware/cas/V1_0/IDescramblerBase.java | ||
103 | $(GEN): $(HIDL) | ||
104 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
105 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IDescramblerBase.hal | ||
106 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
107 | $(GEN): $(LOCAL_PATH)/types.hal | ||
108 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
109 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
110 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
111 | -Ljava \ | ||
112 | -randroid.hardware:hardware/interfaces \ | ||
113 | -randroid.hidl:system/libhidl/transport \ | ||
114 | android.hardware.cas@1.0::IDescramblerBase | ||
115 | |||
116 | $(GEN): $(LOCAL_PATH)/IDescramblerBase.hal | ||
117 | $(transform-generated-source) | ||
118 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
119 | |||
120 | # | ||
121 | # Build IMediaCasService.hal | ||
122 | # | ||
123 | GEN := $(intermediates)/android/hardware/cas/V1_0/IMediaCasService.java | ||
124 | $(GEN): $(HIDL) | ||
125 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
126 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IMediaCasService.hal | ||
127 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ICas.hal | ||
128 | $(GEN): $(LOCAL_PATH)/ICas.hal | ||
129 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ICasListener.hal | ||
130 | $(GEN): $(LOCAL_PATH)/ICasListener.hal | ||
131 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IDescramblerBase.hal | ||
132 | $(GEN): $(LOCAL_PATH)/IDescramblerBase.hal | ||
133 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
134 | $(GEN): $(LOCAL_PATH)/types.hal | ||
135 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
136 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
137 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
138 | -Ljava \ | ||
139 | -randroid.hardware:hardware/interfaces \ | ||
140 | -randroid.hidl:system/libhidl/transport \ | ||
141 | android.hardware.cas@1.0::IMediaCasService | ||
142 | |||
143 | $(GEN): $(LOCAL_PATH)/IMediaCasService.hal | ||
144 | $(transform-generated-source) | ||
145 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
146 | include $(BUILD_JAVA_LIBRARY) | ||
147 | |||
148 | |||
149 | |||
150 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/cas/native/1.0/Android.bp b/cas/native/1.0/Android.bp index 4b5472a8..65bd7fbe 100644 --- a/cas/native/1.0/Android.bp +++ b/cas/native/1.0/Android.bp | |||
@@ -67,6 +67,11 @@ cc_library { | |||
67 | ], | 67 | ], |
68 | } | 68 | } |
69 | 69 | ||
70 | // This package is not java compatible. Not creating java target. | ||
71 | |||
72 | // This package does not export any types. Not creating java constants export. | ||
73 | |||
74 | |||
70 | genrule { | 75 | genrule { |
71 | name: "android.hardware.cas.native@1.0-adapter-helper_genc++", | 76 | name: "android.hardware.cas.native@1.0-adapter-helper_genc++", |
72 | tools: ["hidl-gen"], | 77 | tools: ["hidl-gen"], |
@@ -91,7 +96,6 @@ genrule { | |||
91 | ], | 96 | ], |
92 | } | 97 | } |
93 | 98 | ||
94 | |||
95 | cc_library { | 99 | cc_library { |
96 | name: "android.hardware.cas.native@1.0-adapter-helper", | 100 | name: "android.hardware.cas.native@1.0-adapter-helper", |
97 | defaults: ["hidl-module-defaults"], | 101 | defaults: ["hidl-module-defaults"], |
@@ -134,6 +138,7 @@ genrule { | |||
134 | 138 | ||
135 | cc_test { | 139 | cc_test { |
136 | name: "android.hardware.cas.native@1.0-adapter", | 140 | name: "android.hardware.cas.native@1.0-adapter", |
141 | defaults: ["hidl-module-defaults"], | ||
137 | shared_libs: [ | 142 | shared_libs: [ |
138 | "libhidladapter", | 143 | "libhidladapter", |
139 | "libhidlbase", | 144 | "libhidlbase", |
diff --git a/configstore/1.1/Android.bp b/configstore/1.1/Android.bp index 1bddc6c4..3f8d5801 100644 --- a/configstore/1.1/Android.bp +++ b/configstore/1.1/Android.bp | |||
@@ -64,6 +64,33 @@ cc_library { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | genrule { | 66 | genrule { |
67 | name: "android.hardware.configstore-V1.1-java_gen_java", | ||
68 | tools: ["hidl-gen"], | ||
69 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", | ||
70 | srcs: [ | ||
71 | ":android.hardware.configstore@1.1_hal", | ||
72 | ], | ||
73 | out: [ | ||
74 | "android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java", | ||
75 | ], | ||
76 | } | ||
77 | |||
78 | java_library { | ||
79 | name: "android.hardware.configstore-V1.1-java", | ||
80 | no_framework_libs: true, | ||
81 | defaults: ["hidl-java-module-defaults"], | ||
82 | srcs: [":android.hardware.configstore-V1.1-java_gen_java"], | ||
83 | libs: [ | ||
84 | "hwbinder", | ||
85 | "android.hardware.configstore-V1.0-java", | ||
86 | "android.hidl.base-V1.0-java", | ||
87 | ] | ||
88 | } | ||
89 | |||
90 | // This package does not export any types. Not creating java constants export. | ||
91 | |||
92 | |||
93 | genrule { | ||
67 | name: "android.hardware.configstore@1.1-adapter-helper_genc++", | 94 | name: "android.hardware.configstore@1.1-adapter-helper_genc++", |
68 | tools: ["hidl-gen"], | 95 | tools: ["hidl-gen"], |
69 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", | 96 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1", |
@@ -87,7 +114,6 @@ genrule { | |||
87 | ], | 114 | ], |
88 | } | 115 | } |
89 | 116 | ||
90 | |||
91 | cc_library { | 117 | cc_library { |
92 | name: "android.hardware.configstore@1.1-adapter-helper", | 118 | name: "android.hardware.configstore@1.1-adapter-helper", |
93 | defaults: ["hidl-module-defaults"], | 119 | defaults: ["hidl-module-defaults"], |
@@ -130,6 +156,7 @@ genrule { | |||
130 | 156 | ||
131 | cc_test { | 157 | cc_test { |
132 | name: "android.hardware.configstore@1.1-adapter", | 158 | name: "android.hardware.configstore@1.1-adapter", |
159 | defaults: ["hidl-module-defaults"], | ||
133 | shared_libs: [ | 160 | shared_libs: [ |
134 | "libhidladapter", | 161 | "libhidladapter", |
135 | "libhidlbase", | 162 | "libhidlbase", |
diff --git a/configstore/1.1/Android.mk b/configstore/1.1/Android.mk deleted file mode 100644 index b3f7053c..00000000 --- a/configstore/1.1/Android.mk +++ /dev/null | |||
@@ -1,44 +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.configstore-V1.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.hardware.configstore-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build ISurfaceFlingerConfigs.hal | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.configstore@1.1::ISurfaceFlingerConfigs | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | include $(BUILD_JAVA_LIBRARY) | ||
41 | |||
42 | |||
43 | |||
44 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/graphics/mapper/2.1/Android.bp b/graphics/mapper/2.1/Android.bp index 971cd995..029fbbe6 100644 --- a/graphics/mapper/2.1/Android.bp +++ b/graphics/mapper/2.1/Android.bp | |||
@@ -66,6 +66,11 @@ cc_library { | |||
66 | ], | 66 | ], |
67 | } | 67 | } |
68 | 68 | ||
69 | // This package is not java compatible. Not creating java target. | ||
70 | |||
71 | // This package does not export any types. Not creating java constants export. | ||
72 | |||
73 | |||
69 | genrule { | 74 | genrule { |
70 | name: "android.hardware.graphics.mapper@2.1-adapter-helper_genc++", | 75 | name: "android.hardware.graphics.mapper@2.1-adapter-helper_genc++", |
71 | tools: ["hidl-gen"], | 76 | tools: ["hidl-gen"], |
@@ -90,7 +95,6 @@ genrule { | |||
90 | ], | 95 | ], |
91 | } | 96 | } |
92 | 97 | ||
93 | |||
94 | cc_library { | 98 | cc_library { |
95 | name: "android.hardware.graphics.mapper@2.1-adapter-helper", | 99 | name: "android.hardware.graphics.mapper@2.1-adapter-helper", |
96 | defaults: ["hidl-module-defaults"], | 100 | defaults: ["hidl-module-defaults"], |
@@ -135,6 +139,7 @@ genrule { | |||
135 | 139 | ||
136 | cc_test { | 140 | cc_test { |
137 | name: "android.hardware.graphics.mapper@2.1-adapter", | 141 | name: "android.hardware.graphics.mapper@2.1-adapter", |
142 | defaults: ["hidl-module-defaults"], | ||
138 | shared_libs: [ | 143 | shared_libs: [ |
139 | "libhidladapter", | 144 | "libhidladapter", |
140 | "libhidlbase", | 145 | "libhidlbase", |
diff --git a/media/1.0/Android.mk b/media/1.0/Android.mk deleted file mode 100644 index bc44b9ee..00000000 --- a/media/1.0/Android.mk +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | LOCAL_PATH := $(call my-dir) | ||
2 | |||
3 | ####################################### | ||
4 | # media_profiles_V1_0.dtd | ||
5 | |||
6 | include $(CLEAR_VARS) | ||
7 | |||
8 | LOCAL_MODULE := media_profiles_V1_0.dtd | ||
9 | LOCAL_SRC_FILES := media_profiles.dtd | ||
10 | LOCAL_MODULE_CLASS := ETC | ||
11 | LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) | ||
12 | |||
13 | include $(BUILD_PREBUILT) | ||
14 | |||
diff --git a/neuralnetworks/1.0/Android.bp b/neuralnetworks/1.0/Android.bp index ba32d0c3..26783e7f 100644 --- a/neuralnetworks/1.0/Android.bp +++ b/neuralnetworks/1.0/Android.bp | |||
@@ -85,3 +85,88 @@ cc_library { | |||
85 | "libutils", | 85 | "libutils", |
86 | ], | 86 | ], |
87 | } | 87 | } |
88 | |||
89 | // This package is not java compatible. Not creating java target. | ||
90 | |||
91 | // This package does not export any types. Not creating java constants export. | ||
92 | |||
93 | |||
94 | genrule { | ||
95 | name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++", | ||
96 | tools: ["hidl-gen"], | ||
97 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", | ||
98 | srcs: [ | ||
99 | ":android.hardware.neuralnetworks@1.0_hal", | ||
100 | ], | ||
101 | out: [ | ||
102 | "android/hardware/neuralnetworks/1.0/ADevice.cpp", | ||
103 | "android/hardware/neuralnetworks/1.0/AExecutionCallback.cpp", | ||
104 | "android/hardware/neuralnetworks/1.0/APreparedModel.cpp", | ||
105 | "android/hardware/neuralnetworks/1.0/APreparedModelCallback.cpp", | ||
106 | ], | ||
107 | } | ||
108 | |||
109 | genrule { | ||
110 | name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers", | ||
111 | tools: ["hidl-gen"], | ||
112 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", | ||
113 | srcs: [ | ||
114 | ":android.hardware.neuralnetworks@1.0_hal", | ||
115 | ], | ||
116 | out: [ | ||
117 | "android/hardware/neuralnetworks/1.0/ADevice.h", | ||
118 | "android/hardware/neuralnetworks/1.0/AExecutionCallback.h", | ||
119 | "android/hardware/neuralnetworks/1.0/APreparedModel.h", | ||
120 | "android/hardware/neuralnetworks/1.0/APreparedModelCallback.h", | ||
121 | ], | ||
122 | } | ||
123 | |||
124 | cc_library { | ||
125 | name: "android.hardware.neuralnetworks@1.0-adapter-helper", | ||
126 | defaults: ["hidl-module-defaults"], | ||
127 | generated_sources: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++"], | ||
128 | generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], | ||
129 | export_generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], | ||
130 | vendor_available: true, | ||
131 | shared_libs: [ | ||
132 | "libhidlbase", | ||
133 | "libhidltransport", | ||
134 | "libhwbinder", | ||
135 | "liblog", | ||
136 | "libutils", | ||
137 | "libcutils", | ||
138 | "libhidladapter", | ||
139 | "android.hardware.neuralnetworks@1.0", | ||
140 | "android.hidl.base@1.0-adapter-helper", | ||
141 | ], | ||
142 | export_shared_lib_headers: [ | ||
143 | "libhidlbase", | ||
144 | "libhidltransport", | ||
145 | "libhwbinder", | ||
146 | "libutils", | ||
147 | "libhidladapter", | ||
148 | "android.hardware.neuralnetworks@1.0", | ||
149 | "android.hidl.base@1.0-adapter-helper", | ||
150 | ], | ||
151 | } | ||
152 | |||
153 | genrule { | ||
154 | name: "android.hardware.neuralnetworks@1.0-adapter_genc++", | ||
155 | tools: ["hidl-gen"], | ||
156 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0", | ||
157 | out: ["main.cpp"] | ||
158 | } | ||
159 | |||
160 | cc_test { | ||
161 | name: "android.hardware.neuralnetworks@1.0-adapter", | ||
162 | defaults: ["hidl-module-defaults"], | ||
163 | shared_libs: [ | ||
164 | "libhidladapter", | ||
165 | "libhidlbase", | ||
166 | "libhidltransport", | ||
167 | "libutils", | ||
168 | "android.hardware.neuralnetworks@1.0", | ||
169 | "android.hardware.neuralnetworks@1.0-adapter-helper", | ||
170 | ], | ||
171 | generated_sources: ["android.hardware.neuralnetworks@1.0-adapter_genc++"], | ||
172 | } | ||
diff --git a/oemlock/1.0/Android.bp b/oemlock/1.0/Android.bp index e4cc2362..5dcc89e2 100644 --- a/oemlock/1.0/Android.bp +++ b/oemlock/1.0/Android.bp | |||
@@ -66,6 +66,34 @@ cc_library { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | genrule { | 68 | genrule { |
69 | name: "android.hardware.oemlock-V1.0-java_gen_java", | ||
70 | tools: ["hidl-gen"], | ||
71 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", | ||
72 | srcs: [ | ||
73 | ":android.hardware.oemlock@1.0_hal", | ||
74 | ], | ||
75 | out: [ | ||
76 | "android/hardware/oemlock/V1_0/OemLockSecureStatus.java", | ||
77 | "android/hardware/oemlock/V1_0/OemLockStatus.java", | ||
78 | "android/hardware/oemlock/V1_0/IOemLock.java", | ||
79 | ], | ||
80 | } | ||
81 | |||
82 | java_library { | ||
83 | name: "android.hardware.oemlock-V1.0-java", | ||
84 | no_framework_libs: true, | ||
85 | defaults: ["hidl-java-module-defaults"], | ||
86 | srcs: [":android.hardware.oemlock-V1.0-java_gen_java"], | ||
87 | libs: [ | ||
88 | "hwbinder", | ||
89 | "android.hidl.base-V1.0-java", | ||
90 | ] | ||
91 | } | ||
92 | |||
93 | // This package does not export any types. Not creating java constants export. | ||
94 | |||
95 | |||
96 | genrule { | ||
69 | name: "android.hardware.oemlock@1.0-adapter-helper_genc++", | 97 | name: "android.hardware.oemlock@1.0-adapter-helper_genc++", |
70 | tools: ["hidl-gen"], | 98 | tools: ["hidl-gen"], |
71 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", | 99 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0", |
@@ -89,7 +117,6 @@ genrule { | |||
89 | ], | 117 | ], |
90 | } | 118 | } |
91 | 119 | ||
92 | |||
93 | cc_library { | 120 | cc_library { |
94 | name: "android.hardware.oemlock@1.0-adapter-helper", | 121 | name: "android.hardware.oemlock@1.0-adapter-helper", |
95 | defaults: ["hidl-module-defaults"], | 122 | defaults: ["hidl-module-defaults"], |
@@ -128,6 +155,7 @@ genrule { | |||
128 | 155 | ||
129 | cc_test { | 156 | cc_test { |
130 | name: "android.hardware.oemlock@1.0-adapter", | 157 | name: "android.hardware.oemlock@1.0-adapter", |
158 | defaults: ["hidl-module-defaults"], | ||
131 | shared_libs: [ | 159 | shared_libs: [ |
132 | "libhidladapter", | 160 | "libhidladapter", |
133 | "libhidlbase", | 161 | "libhidlbase", |
diff --git a/oemlock/1.0/Android.mk b/oemlock/1.0/Android.mk deleted file mode 100644 index 91cc8f8c..00000000 --- a/oemlock/1.0/Android.mk +++ /dev/null | |||
@@ -1,83 +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.oemlock-V1.0-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 (OemLockSecureStatus) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockSecureStatus.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.oemlock@1.0::types.OemLockSecureStatus | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (OemLockStatus) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockStatus.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.oemlock@1.0::types.OemLockStatus | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build IOemLock.hal | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/oemlock/V1_0/IOemLock.java | ||
63 | $(GEN): $(HIDL) | ||
64 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
65 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IOemLock.hal | ||
66 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
67 | $(GEN): $(LOCAL_PATH)/types.hal | ||
68 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
69 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
70 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
71 | -Ljava \ | ||
72 | -randroid.hardware:hardware/interfaces \ | ||
73 | -randroid.hidl:system/libhidl/transport \ | ||
74 | android.hardware.oemlock@1.0::IOemLock | ||
75 | |||
76 | $(GEN): $(LOCAL_PATH)/IOemLock.hal | ||
77 | $(transform-generated-source) | ||
78 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
79 | include $(BUILD_JAVA_LIBRARY) | ||
80 | |||
81 | |||
82 | |||
83 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/power/1.1/Android.bp b/power/1.1/Android.bp index 8da0894a..cea63835 100644 --- a/power/1.1/Android.bp +++ b/power/1.1/Android.bp | |||
@@ -68,6 +68,35 @@ cc_library { | |||
68 | } | 68 | } |
69 | 69 | ||
70 | genrule { | 70 | genrule { |
71 | name: "android.hardware.power-V1.1-java_gen_java", | ||
72 | tools: ["hidl-gen"], | ||
73 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", | ||
74 | srcs: [ | ||
75 | ":android.hardware.power@1.1_hal", | ||
76 | ], | ||
77 | out: [ | ||
78 | "android/hardware/power/V1_1/PowerStateSubsystem.java", | ||
79 | "android/hardware/power/V1_1/PowerStateSubsystemSleepState.java", | ||
80 | "android/hardware/power/V1_1/IPower.java", | ||
81 | ], | ||
82 | } | ||
83 | |||
84 | java_library { | ||
85 | name: "android.hardware.power-V1.1-java", | ||
86 | no_framework_libs: true, | ||
87 | defaults: ["hidl-java-module-defaults"], | ||
88 | srcs: [":android.hardware.power-V1.1-java_gen_java"], | ||
89 | libs: [ | ||
90 | "hwbinder", | ||
91 | "android.hardware.power-V1.0-java", | ||
92 | "android.hidl.base-V1.0-java", | ||
93 | ] | ||
94 | } | ||
95 | |||
96 | // This package does not export any types. Not creating java constants export. | ||
97 | |||
98 | |||
99 | genrule { | ||
71 | name: "android.hardware.power@1.1-adapter-helper_genc++", | 100 | name: "android.hardware.power@1.1-adapter-helper_genc++", |
72 | tools: ["hidl-gen"], | 101 | tools: ["hidl-gen"], |
73 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", | 102 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", |
@@ -91,7 +120,6 @@ genrule { | |||
91 | ], | 120 | ], |
92 | } | 121 | } |
93 | 122 | ||
94 | |||
95 | cc_library { | 123 | cc_library { |
96 | name: "android.hardware.power@1.1-adapter-helper", | 124 | name: "android.hardware.power@1.1-adapter-helper", |
97 | defaults: ["hidl-module-defaults"], | 125 | defaults: ["hidl-module-defaults"], |
@@ -134,6 +162,7 @@ genrule { | |||
134 | 162 | ||
135 | cc_test { | 163 | cc_test { |
136 | name: "android.hardware.power@1.1-adapter", | 164 | name: "android.hardware.power@1.1-adapter", |
165 | defaults: ["hidl-module-defaults"], | ||
137 | shared_libs: [ | 166 | shared_libs: [ |
138 | "libhidladapter", | 167 | "libhidladapter", |
139 | "libhidlbase", | 168 | "libhidlbase", |
diff --git a/power/1.1/Android.mk b/power/1.1/Android.mk deleted file mode 100644 index 5044cfa6..00000000 --- a/power/1.1/Android.mk +++ /dev/null | |||
@@ -1,84 +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.power-V1.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.hardware.power-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build types.hal (PowerStateSubsystem) | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/power/V1_1/PowerStateSubsystem.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.power@1.1::types.PowerStateSubsystem | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/types.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | |||
41 | # | ||
42 | # Build types.hal (PowerStateSubsystemSleepState) | ||
43 | # | ||
44 | GEN := $(intermediates)/android/hardware/power/V1_1/PowerStateSubsystemSleepState.java | ||
45 | $(GEN): $(HIDL) | ||
46 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
47 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
48 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
49 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
50 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
51 | -Ljava \ | ||
52 | -randroid.hardware:hardware/interfaces \ | ||
53 | -randroid.hidl:system/libhidl/transport \ | ||
54 | android.hardware.power@1.1::types.PowerStateSubsystemSleepState | ||
55 | |||
56 | $(GEN): $(LOCAL_PATH)/types.hal | ||
57 | $(transform-generated-source) | ||
58 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
59 | |||
60 | # | ||
61 | # Build IPower.hal | ||
62 | # | ||
63 | GEN := $(intermediates)/android/hardware/power/V1_1/IPower.java | ||
64 | $(GEN): $(HIDL) | ||
65 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
66 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IPower.hal | ||
67 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
68 | $(GEN): $(LOCAL_PATH)/types.hal | ||
69 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
70 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
71 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
72 | -Ljava \ | ||
73 | -randroid.hardware:hardware/interfaces \ | ||
74 | -randroid.hidl:system/libhidl/transport \ | ||
75 | android.hardware.power@1.1::IPower | ||
76 | |||
77 | $(GEN): $(LOCAL_PATH)/IPower.hal | ||
78 | $(transform-generated-source) | ||
79 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
80 | include $(BUILD_JAVA_LIBRARY) | ||
81 | |||
82 | |||
83 | |||
84 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp index 58e709ee..59269931 100644 --- a/thermal/1.1/Android.bp +++ b/thermal/1.1/Android.bp | |||
@@ -71,6 +71,34 @@ cc_library { | |||
71 | } | 71 | } |
72 | 72 | ||
73 | genrule { | 73 | genrule { |
74 | name: "android.hardware.thermal-V1.1-java_gen_java", | ||
75 | tools: ["hidl-gen"], | ||
76 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", | ||
77 | srcs: [ | ||
78 | ":android.hardware.thermal@1.1_hal", | ||
79 | ], | ||
80 | out: [ | ||
81 | "android/hardware/thermal/V1_1/IThermal.java", | ||
82 | "android/hardware/thermal/V1_1/IThermalCallback.java", | ||
83 | ], | ||
84 | } | ||
85 | |||
86 | java_library { | ||
87 | name: "android.hardware.thermal-V1.1-java", | ||
88 | no_framework_libs: true, | ||
89 | defaults: ["hidl-java-module-defaults"], | ||
90 | srcs: [":android.hardware.thermal-V1.1-java_gen_java"], | ||
91 | libs: [ | ||
92 | "hwbinder", | ||
93 | "android.hardware.thermal-V1.0-java", | ||
94 | "android.hidl.base-V1.0-java", | ||
95 | ] | ||
96 | } | ||
97 | |||
98 | // This package does not export any types. Not creating java constants export. | ||
99 | |||
100 | |||
101 | genrule { | ||
74 | name: "android.hardware.thermal@1.1-adapter-helper_genc++", | 102 | name: "android.hardware.thermal@1.1-adapter-helper_genc++", |
75 | tools: ["hidl-gen"], | 103 | tools: ["hidl-gen"], |
76 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", | 104 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.1", |
@@ -96,7 +124,6 @@ genrule { | |||
96 | ], | 124 | ], |
97 | } | 125 | } |
98 | 126 | ||
99 | |||
100 | cc_library { | 127 | cc_library { |
101 | name: "android.hardware.thermal@1.1-adapter-helper", | 128 | name: "android.hardware.thermal@1.1-adapter-helper", |
102 | defaults: ["hidl-module-defaults"], | 129 | defaults: ["hidl-module-defaults"], |
@@ -139,6 +166,7 @@ genrule { | |||
139 | 166 | ||
140 | cc_test { | 167 | cc_test { |
141 | name: "android.hardware.thermal@1.1-adapter", | 168 | name: "android.hardware.thermal@1.1-adapter", |
169 | defaults: ["hidl-module-defaults"], | ||
142 | shared_libs: [ | 170 | shared_libs: [ |
143 | "libhidladapter", | 171 | "libhidladapter", |
144 | "libhidlbase", | 172 | "libhidlbase", |
diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk deleted file mode 100644 index 059ac8bd..00000000 --- a/thermal/1.1/Android.mk +++ /dev/null | |||
@@ -1,65 +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.thermal-V1.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.hardware.thermal-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build IThermal.hal | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermal.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermal.hal | ||
29 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IThermalCallback.hal | ||
30 | $(GEN): $(LOCAL_PATH)/IThermalCallback.hal | ||
31 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
32 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
33 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
34 | -Ljava \ | ||
35 | -randroid.hardware:hardware/interfaces \ | ||
36 | -randroid.hidl:system/libhidl/transport \ | ||
37 | android.hardware.thermal@1.1::IThermal | ||
38 | |||
39 | $(GEN): $(LOCAL_PATH)/IThermal.hal | ||
40 | $(transform-generated-source) | ||
41 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
42 | |||
43 | # | ||
44 | # Build IThermalCallback.hal | ||
45 | # | ||
46 | GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermalCallback.java | ||
47 | $(GEN): $(HIDL) | ||
48 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
49 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermalCallback.hal | ||
50 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
51 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
52 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
53 | -Ljava \ | ||
54 | -randroid.hardware:hardware/interfaces \ | ||
55 | -randroid.hidl:system/libhidl/transport \ | ||
56 | android.hardware.thermal@1.1::IThermalCallback | ||
57 | |||
58 | $(GEN): $(LOCAL_PATH)/IThermalCallback.hal | ||
59 | $(transform-generated-source) | ||
60 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
61 | include $(BUILD_JAVA_LIBRARY) | ||
62 | |||
63 | |||
64 | |||
65 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp index c6c2034c..67bc0a66 100644 --- a/usb/1.1/Android.bp +++ b/usb/1.1/Android.bp | |||
@@ -75,6 +75,52 @@ cc_library { | |||
75 | } | 75 | } |
76 | 76 | ||
77 | genrule { | 77 | genrule { |
78 | name: "android.hardware.usb-V1.1-java_gen_java", | ||
79 | tools: ["hidl-gen"], | ||
80 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", | ||
81 | srcs: [ | ||
82 | ":android.hardware.usb@1.1_hal", | ||
83 | ], | ||
84 | out: [ | ||
85 | "android/hardware/usb/V1_1/PortMode_1_1.java", | ||
86 | "android/hardware/usb/V1_1/PortStatus_1_1.java", | ||
87 | "android/hardware/usb/V1_1/IUsb.java", | ||
88 | "android/hardware/usb/V1_1/IUsbCallback.java", | ||
89 | ], | ||
90 | } | ||
91 | |||
92 | java_library { | ||
93 | name: "android.hardware.usb-V1.1-java", | ||
94 | no_framework_libs: true, | ||
95 | defaults: ["hidl-java-module-defaults"], | ||
96 | srcs: [":android.hardware.usb-V1.1-java_gen_java"], | ||
97 | libs: [ | ||
98 | "hwbinder", | ||
99 | "android.hardware.usb-V1.0-java", | ||
100 | "android.hidl.base-V1.0-java", | ||
101 | ] | ||
102 | } | ||
103 | |||
104 | genrule { | ||
105 | name: "android.hardware.usb-V1.1-java-constants_gen_java", | ||
106 | tools: ["hidl-gen"], | ||
107 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", | ||
108 | srcs: [ | ||
109 | ":android.hardware.usb@1.1_hal", | ||
110 | ], | ||
111 | out: [ | ||
112 | "android/hardware/usb/V1_1/Constants.java", | ||
113 | ], | ||
114 | } | ||
115 | |||
116 | java_library { | ||
117 | name: "android.hardware.usb-V1.1-java-constants", | ||
118 | no_framework_libs: true, | ||
119 | defaults: ["hidl-java-module-defaults"], | ||
120 | srcs: [":android.hardware.usb-V1.1-java-constants_gen_java"], | ||
121 | } | ||
122 | |||
123 | genrule { | ||
78 | name: "android.hardware.usb@1.1-adapter-helper_genc++", | 124 | name: "android.hardware.usb@1.1-adapter-helper_genc++", |
79 | tools: ["hidl-gen"], | 125 | tools: ["hidl-gen"], |
80 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", | 126 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1", |
@@ -100,7 +146,6 @@ genrule { | |||
100 | ], | 146 | ], |
101 | } | 147 | } |
102 | 148 | ||
103 | |||
104 | cc_library { | 149 | cc_library { |
105 | name: "android.hardware.usb@1.1-adapter-helper", | 150 | name: "android.hardware.usb@1.1-adapter-helper", |
106 | defaults: ["hidl-module-defaults"], | 151 | defaults: ["hidl-module-defaults"], |
@@ -143,6 +188,7 @@ genrule { | |||
143 | 188 | ||
144 | cc_test { | 189 | cc_test { |
145 | name: "android.hardware.usb@1.1-adapter", | 190 | name: "android.hardware.usb@1.1-adapter", |
191 | defaults: ["hidl-module-defaults"], | ||
146 | shared_libs: [ | 192 | shared_libs: [ |
147 | "libhidladapter", | 193 | "libhidladapter", |
148 | "libhidlbase", | 194 | "libhidlbase", |
diff --git a/usb/1.1/Android.mk b/usb/1.1/Android.mk deleted file mode 100644 index 57147f18..00000000 --- a/usb/1.1/Android.mk +++ /dev/null | |||
@@ -1,138 +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.usb-V1.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.hardware.usb-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build types.hal (PortMode_1_1) | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/usb/V1_1/PortMode_1_1.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.usb@1.1::types.PortMode_1_1 | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/types.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | |||
41 | # | ||
42 | # Build types.hal (PortStatus_1_1) | ||
43 | # | ||
44 | GEN := $(intermediates)/android/hardware/usb/V1_1/PortStatus_1_1.java | ||
45 | $(GEN): $(HIDL) | ||
46 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
47 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
48 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
49 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
50 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
51 | -Ljava \ | ||
52 | -randroid.hardware:hardware/interfaces \ | ||
53 | -randroid.hidl:system/libhidl/transport \ | ||
54 | android.hardware.usb@1.1::types.PortStatus_1_1 | ||
55 | |||
56 | $(GEN): $(LOCAL_PATH)/types.hal | ||
57 | $(transform-generated-source) | ||
58 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
59 | |||
60 | # | ||
61 | # Build IUsb.hal | ||
62 | # | ||
63 | GEN := $(intermediates)/android/hardware/usb/V1_1/IUsb.java | ||
64 | $(GEN): $(HIDL) | ||
65 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
66 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IUsb.hal | ||
67 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
68 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
69 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
70 | -Ljava \ | ||
71 | -randroid.hardware:hardware/interfaces \ | ||
72 | -randroid.hidl:system/libhidl/transport \ | ||
73 | android.hardware.usb@1.1::IUsb | ||
74 | |||
75 | $(GEN): $(LOCAL_PATH)/IUsb.hal | ||
76 | $(transform-generated-source) | ||
77 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
78 | |||
79 | # | ||
80 | # Build IUsbCallback.hal | ||
81 | # | ||
82 | GEN := $(intermediates)/android/hardware/usb/V1_1/IUsbCallback.java | ||
83 | $(GEN): $(HIDL) | ||
84 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
85 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IUsbCallback.hal | ||
86 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
87 | $(GEN): $(LOCAL_PATH)/types.hal | ||
88 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
89 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
90 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
91 | -Ljava \ | ||
92 | -randroid.hardware:hardware/interfaces \ | ||
93 | -randroid.hidl:system/libhidl/transport \ | ||
94 | android.hardware.usb@1.1::IUsbCallback | ||
95 | |||
96 | $(GEN): $(LOCAL_PATH)/IUsbCallback.hal | ||
97 | $(transform-generated-source) | ||
98 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
99 | include $(BUILD_JAVA_LIBRARY) | ||
100 | |||
101 | |||
102 | ################################################################################ | ||
103 | |||
104 | include $(CLEAR_VARS) | ||
105 | LOCAL_MODULE := android.hardware.usb-V1.1-java-constants | ||
106 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
107 | |||
108 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
109 | |||
110 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
111 | # | ||
112 | GEN := $(intermediates)/android/hardware/usb/V1_1/Constants.java | ||
113 | $(GEN): $(HIDL) | ||
114 | $(GEN): $(LOCAL_PATH)/types.hal | ||
115 | $(GEN): $(LOCAL_PATH)/IUsb.hal | ||
116 | $(GEN): $(LOCAL_PATH)/IUsbCallback.hal | ||
117 | |||
118 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
119 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
120 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
121 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
122 | -Ljava-constants \ | ||
123 | -randroid.hardware:hardware/interfaces \ | ||
124 | -randroid.hidl:system/libhidl/transport \ | ||
125 | android.hardware.usb@1.1 | ||
126 | |||
127 | $(GEN): | ||
128 | $(transform-generated-source) | ||
129 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
130 | # Avoid dependency cycle of framework.jar -> this-library -> framework.jar | ||
131 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
132 | LOCAL_JAVA_LIBRARIES := core-oj | ||
133 | |||
134 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
135 | |||
136 | |||
137 | |||
138 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index 7ce19714..11985fda 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp | |||
@@ -68,6 +68,50 @@ cc_library { | |||
68 | } | 68 | } |
69 | 69 | ||
70 | genrule { | 70 | genrule { |
71 | name: "android.hardware.vibrator-V1.1-java_gen_java", | ||
72 | tools: ["hidl-gen"], | ||
73 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | ||
74 | srcs: [ | ||
75 | ":android.hardware.vibrator@1.1_hal", | ||
76 | ], | ||
77 | out: [ | ||
78 | "android/hardware/vibrator/V1_1/Effect_1_1.java", | ||
79 | "android/hardware/vibrator/V1_1/IVibrator.java", | ||
80 | ], | ||
81 | } | ||
82 | |||
83 | java_library { | ||
84 | name: "android.hardware.vibrator-V1.1-java", | ||
85 | no_framework_libs: true, | ||
86 | defaults: ["hidl-java-module-defaults"], | ||
87 | srcs: [":android.hardware.vibrator-V1.1-java_gen_java"], | ||
88 | libs: [ | ||
89 | "hwbinder", | ||
90 | "android.hardware.vibrator-V1.0-java", | ||
91 | "android.hidl.base-V1.0-java", | ||
92 | ] | ||
93 | } | ||
94 | |||
95 | genrule { | ||
96 | name: "android.hardware.vibrator-V1.1-java-constants_gen_java", | ||
97 | tools: ["hidl-gen"], | ||
98 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | ||
99 | srcs: [ | ||
100 | ":android.hardware.vibrator@1.1_hal", | ||
101 | ], | ||
102 | out: [ | ||
103 | "android/hardware/vibrator/V1_1/Constants.java", | ||
104 | ], | ||
105 | } | ||
106 | |||
107 | java_library { | ||
108 | name: "android.hardware.vibrator-V1.1-java-constants", | ||
109 | no_framework_libs: true, | ||
110 | defaults: ["hidl-java-module-defaults"], | ||
111 | srcs: [":android.hardware.vibrator-V1.1-java-constants_gen_java"], | ||
112 | } | ||
113 | |||
114 | genrule { | ||
71 | name: "android.hardware.vibrator@1.1-adapter-helper_genc++", | 115 | name: "android.hardware.vibrator@1.1-adapter-helper_genc++", |
72 | tools: ["hidl-gen"], | 116 | tools: ["hidl-gen"], |
73 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | 117 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", |
@@ -91,7 +135,6 @@ genrule { | |||
91 | ], | 135 | ], |
92 | } | 136 | } |
93 | 137 | ||
94 | |||
95 | cc_library { | 138 | cc_library { |
96 | name: "android.hardware.vibrator@1.1-adapter-helper", | 139 | name: "android.hardware.vibrator@1.1-adapter-helper", |
97 | defaults: ["hidl-module-defaults"], | 140 | defaults: ["hidl-module-defaults"], |
@@ -134,6 +177,7 @@ genrule { | |||
134 | 177 | ||
135 | cc_test { | 178 | cc_test { |
136 | name: "android.hardware.vibrator@1.1-adapter", | 179 | name: "android.hardware.vibrator@1.1-adapter", |
180 | defaults: ["hidl-module-defaults"], | ||
137 | shared_libs: [ | 181 | shared_libs: [ |
138 | "libhidladapter", | 182 | "libhidladapter", |
139 | "libhidlbase", | 183 | "libhidlbase", |
diff --git a/vibrator/1.1/Android.mk b/vibrator/1.1/Android.mk deleted file mode 100644 index d08f8376..00000000 --- a/vibrator/1.1/Android.mk +++ /dev/null | |||
@@ -1,99 +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.vibrator-V1.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.hardware.vibrator-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build types.hal (Effect_1_1) | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/Effect_1_1.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.vibrator@1.1::types.Effect_1_1 | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/types.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | |||
41 | # | ||
42 | # Build IVibrator.hal | ||
43 | # | ||
44 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/IVibrator.java | ||
45 | $(GEN): $(HIDL) | ||
46 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
47 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVibrator.hal | ||
48 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
49 | $(GEN): $(LOCAL_PATH)/types.hal | ||
50 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
51 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
52 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
53 | -Ljava \ | ||
54 | -randroid.hardware:hardware/interfaces \ | ||
55 | -randroid.hidl:system/libhidl/transport \ | ||
56 | android.hardware.vibrator@1.1::IVibrator | ||
57 | |||
58 | $(GEN): $(LOCAL_PATH)/IVibrator.hal | ||
59 | $(transform-generated-source) | ||
60 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
61 | include $(BUILD_JAVA_LIBRARY) | ||
62 | |||
63 | |||
64 | ################################################################################ | ||
65 | |||
66 | include $(CLEAR_VARS) | ||
67 | LOCAL_MODULE := android.hardware.vibrator-V1.1-java-constants | ||
68 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
69 | |||
70 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
71 | |||
72 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
73 | # | ||
74 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/Constants.java | ||
75 | $(GEN): $(HIDL) | ||
76 | $(GEN): $(LOCAL_PATH)/types.hal | ||
77 | $(GEN): $(LOCAL_PATH)/IVibrator.hal | ||
78 | |||
79 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
80 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
81 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
82 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
83 | -Ljava-constants \ | ||
84 | -randroid.hardware:hardware/interfaces \ | ||
85 | -randroid.hidl:system/libhidl/transport \ | ||
86 | android.hardware.vibrator@1.1 | ||
87 | |||
88 | $(GEN): | ||
89 | $(transform-generated-source) | ||
90 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
91 | # Avoid dependency cycle of framework.jar -> this-library -> framework.jar | ||
92 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
93 | LOCAL_JAVA_LIBRARIES := core-oj | ||
94 | |||
95 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
96 | |||
97 | |||
98 | |||
99 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp index c4077535..b7bf1fe5 100644 --- a/weaver/1.0/Android.bp +++ b/weaver/1.0/Android.bp | |||
@@ -66,6 +66,36 @@ cc_library { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | genrule { | 68 | genrule { |
69 | name: "android.hardware.weaver-V1.0-java_gen_java", | ||
70 | tools: ["hidl-gen"], | ||
71 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", | ||
72 | srcs: [ | ||
73 | ":android.hardware.weaver@1.0_hal", | ||
74 | ], | ||
75 | out: [ | ||
76 | "android/hardware/weaver/V1_0/WeaverConfig.java", | ||
77 | "android/hardware/weaver/V1_0/WeaverReadResponse.java", | ||
78 | "android/hardware/weaver/V1_0/WeaverReadStatus.java", | ||
79 | "android/hardware/weaver/V1_0/WeaverStatus.java", | ||
80 | "android/hardware/weaver/V1_0/IWeaver.java", | ||
81 | ], | ||
82 | } | ||
83 | |||
84 | java_library { | ||
85 | name: "android.hardware.weaver-V1.0-java", | ||
86 | no_framework_libs: true, | ||
87 | defaults: ["hidl-java-module-defaults"], | ||
88 | srcs: [":android.hardware.weaver-V1.0-java_gen_java"], | ||
89 | libs: [ | ||
90 | "hwbinder", | ||
91 | "android.hidl.base-V1.0-java", | ||
92 | ] | ||
93 | } | ||
94 | |||
95 | // This package does not export any types. Not creating java constants export. | ||
96 | |||
97 | |||
98 | genrule { | ||
69 | name: "android.hardware.weaver@1.0-adapter-helper_genc++", | 99 | name: "android.hardware.weaver@1.0-adapter-helper_genc++", |
70 | tools: ["hidl-gen"], | 100 | tools: ["hidl-gen"], |
71 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", | 101 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.weaver@1.0", |
@@ -89,7 +119,6 @@ genrule { | |||
89 | ], | 119 | ], |
90 | } | 120 | } |
91 | 121 | ||
92 | |||
93 | cc_library { | 122 | cc_library { |
94 | name: "android.hardware.weaver@1.0-adapter-helper", | 123 | name: "android.hardware.weaver@1.0-adapter-helper", |
95 | defaults: ["hidl-module-defaults"], | 124 | defaults: ["hidl-module-defaults"], |
@@ -128,6 +157,7 @@ genrule { | |||
128 | 157 | ||
129 | cc_test { | 158 | cc_test { |
130 | name: "android.hardware.weaver@1.0-adapter", | 159 | name: "android.hardware.weaver@1.0-adapter", |
160 | defaults: ["hidl-module-defaults"], | ||
131 | shared_libs: [ | 161 | shared_libs: [ |
132 | "libhidladapter", | 162 | "libhidladapter", |
133 | "libhidlbase", | 163 | "libhidlbase", |
diff --git a/weaver/1.0/Android.mk b/weaver/1.0/Android.mk deleted file mode 100644 index ab33a158..00000000 --- a/weaver/1.0/Android.mk +++ /dev/null | |||
@@ -1,121 +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.weaver-V1.0-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 (WeaverConfig) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverConfig.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.weaver@1.0::types.WeaverConfig | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (WeaverReadResponse) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverReadResponse.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.weaver@1.0::types.WeaverReadResponse | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build types.hal (WeaverReadStatus) | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverReadStatus.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.weaver@1.0::types.WeaverReadStatus | ||
73 | |||
74 | $(GEN): $(LOCAL_PATH)/types.hal | ||
75 | $(transform-generated-source) | ||
76 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
77 | |||
78 | # | ||
79 | # Build types.hal (WeaverStatus) | ||
80 | # | ||
81 | GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverStatus.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.weaver@1.0::types.WeaverStatus | ||
92 | |||
93 | $(GEN): $(LOCAL_PATH)/types.hal | ||
94 | $(transform-generated-source) | ||
95 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
96 | |||
97 | # | ||
98 | # Build IWeaver.hal | ||
99 | # | ||
100 | GEN := $(intermediates)/android/hardware/weaver/V1_0/IWeaver.java | ||
101 | $(GEN): $(HIDL) | ||
102 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
103 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWeaver.hal | ||
104 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
105 | $(GEN): $(LOCAL_PATH)/types.hal | ||
106 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
107 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
108 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
109 | -Ljava \ | ||
110 | -randroid.hardware:hardware/interfaces \ | ||
111 | -randroid.hidl:system/libhidl/transport \ | ||
112 | android.hardware.weaver@1.0::IWeaver | ||
113 | |||
114 | $(GEN): $(LOCAL_PATH)/IWeaver.hal | ||
115 | $(transform-generated-source) | ||
116 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
117 | include $(BUILD_JAVA_LIBRARY) | ||
118 | |||
119 | |||
120 | |||
121 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/wifi/1.1/Android.bp b/wifi/1.1/Android.bp index 0b6ecb81..0878abc8 100644 --- a/wifi/1.1/Android.bp +++ b/wifi/1.1/Android.bp | |||
@@ -71,6 +71,34 @@ cc_library { | |||
71 | } | 71 | } |
72 | 72 | ||
73 | genrule { | 73 | genrule { |
74 | name: "android.hardware.wifi-V1.1-java_gen_java", | ||
75 | tools: ["hidl-gen"], | ||
76 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", | ||
77 | srcs: [ | ||
78 | ":android.hardware.wifi@1.1_hal", | ||
79 | ], | ||
80 | out: [ | ||
81 | "android/hardware/wifi/V1_1/IWifi.java", | ||
82 | "android/hardware/wifi/V1_1/IWifiChip.java", | ||
83 | ], | ||
84 | } | ||
85 | |||
86 | java_library { | ||
87 | name: "android.hardware.wifi-V1.1-java", | ||
88 | no_framework_libs: true, | ||
89 | defaults: ["hidl-java-module-defaults"], | ||
90 | srcs: [":android.hardware.wifi-V1.1-java_gen_java"], | ||
91 | libs: [ | ||
92 | "hwbinder", | ||
93 | "android.hardware.wifi-V1.0-java", | ||
94 | "android.hidl.base-V1.0-java", | ||
95 | ] | ||
96 | } | ||
97 | |||
98 | // This package does not export any types. Not creating java constants export. | ||
99 | |||
100 | |||
101 | genrule { | ||
74 | name: "android.hardware.wifi@1.1-adapter-helper_genc++", | 102 | name: "android.hardware.wifi@1.1-adapter-helper_genc++", |
75 | tools: ["hidl-gen"], | 103 | tools: ["hidl-gen"], |
76 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", | 104 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.1", |
@@ -96,7 +124,6 @@ genrule { | |||
96 | ], | 124 | ], |
97 | } | 125 | } |
98 | 126 | ||
99 | |||
100 | cc_library { | 127 | cc_library { |
101 | name: "android.hardware.wifi@1.1-adapter-helper", | 128 | name: "android.hardware.wifi@1.1-adapter-helper", |
102 | defaults: ["hidl-module-defaults"], | 129 | defaults: ["hidl-module-defaults"], |
@@ -139,6 +166,7 @@ genrule { | |||
139 | 166 | ||
140 | cc_test { | 167 | cc_test { |
141 | name: "android.hardware.wifi@1.1-adapter", | 168 | name: "android.hardware.wifi@1.1-adapter", |
169 | defaults: ["hidl-module-defaults"], | ||
142 | shared_libs: [ | 170 | shared_libs: [ |
143 | "libhidladapter", | 171 | "libhidladapter", |
144 | "libhidlbase", | 172 | "libhidlbase", |
diff --git a/wifi/1.1/Android.mk b/wifi/1.1/Android.mk deleted file mode 100644 index 5f4bc6a4..00000000 --- a/wifi/1.1/Android.mk +++ /dev/null | |||
@@ -1,63 +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.wifi-V1.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.hardware.wifi-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build IWifi.hal | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/wifi/V1_1/IWifi.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.wifi@1.1::IWifi | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/IWifi.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | |||
41 | # | ||
42 | # Build IWifiChip.hal | ||
43 | # | ||
44 | GEN := $(intermediates)/android/hardware/wifi/V1_1/IWifiChip.java | ||
45 | $(GEN): $(HIDL) | ||
46 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
47 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal | ||
48 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
49 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
50 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
51 | -Ljava \ | ||
52 | -randroid.hardware:hardware/interfaces \ | ||
53 | -randroid.hidl:system/libhidl/transport \ | ||
54 | android.hardware.wifi@1.1::IWifiChip | ||
55 | |||
56 | $(GEN): $(LOCAL_PATH)/IWifiChip.hal | ||
57 | $(transform-generated-source) | ||
58 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
59 | include $(BUILD_JAVA_LIBRARY) | ||
60 | |||
61 | |||
62 | |||
63 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/wifi/1.2/Android.bp b/wifi/1.2/Android.bp index 4cf5b356..7547848a 100644 --- a/wifi/1.2/Android.bp +++ b/wifi/1.2/Android.bp | |||
@@ -73,6 +73,35 @@ cc_library { | |||
73 | } | 73 | } |
74 | 74 | ||
75 | genrule { | 75 | genrule { |
76 | name: "android.hardware.wifi-V1.2-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.wifi@1.2", | ||
79 | srcs: [ | ||
80 | ":android.hardware.wifi@1.2_hal", | ||
81 | ], | ||
82 | out: [ | ||
83 | "android/hardware/wifi/V1_2/IWifi.java", | ||
84 | "android/hardware/wifi/V1_2/IWifiChip.java", | ||
85 | ], | ||
86 | } | ||
87 | |||
88 | java_library { | ||
89 | name: "android.hardware.wifi-V1.2-java", | ||
90 | no_framework_libs: true, | ||
91 | defaults: ["hidl-java-module-defaults"], | ||
92 | srcs: [":android.hardware.wifi-V1.2-java_gen_java"], | ||
93 | libs: [ | ||
94 | "hwbinder", | ||
95 | "android.hardware.wifi-V1.0-java", | ||
96 | "android.hardware.wifi-V1.1-java", | ||
97 | "android.hidl.base-V1.0-java", | ||
98 | ] | ||
99 | } | ||
100 | |||
101 | // This package does not export any types. Not creating java constants export. | ||
102 | |||
103 | |||
104 | genrule { | ||
76 | name: "android.hardware.wifi@1.2-adapter-helper_genc++", | 105 | name: "android.hardware.wifi@1.2-adapter-helper_genc++", |
77 | tools: ["hidl-gen"], | 106 | tools: ["hidl-gen"], |
78 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", | 107 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", |
@@ -98,7 +127,6 @@ genrule { | |||
98 | ], | 127 | ], |
99 | } | 128 | } |
100 | 129 | ||
101 | |||
102 | cc_library { | 130 | cc_library { |
103 | name: "android.hardware.wifi@1.2-adapter-helper", | 131 | name: "android.hardware.wifi@1.2-adapter-helper", |
104 | defaults: ["hidl-module-defaults"], | 132 | defaults: ["hidl-module-defaults"], |
@@ -145,6 +173,7 @@ genrule { | |||
145 | 173 | ||
146 | cc_test { | 174 | cc_test { |
147 | name: "android.hardware.wifi@1.2-adapter", | 175 | name: "android.hardware.wifi@1.2-adapter", |
176 | defaults: ["hidl-module-defaults"], | ||
148 | shared_libs: [ | 177 | shared_libs: [ |
149 | "libhidladapter", | 178 | "libhidladapter", |
150 | "libhidlbase", | 179 | "libhidlbase", |
diff --git a/wifi/1.2/Android.mk b/wifi/1.2/Android.mk deleted file mode 100644 index d7380768..00000000 --- a/wifi/1.2/Android.mk +++ /dev/null | |||
@@ -1,64 +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.wifi-V1.2-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.hardware.wifi-V1.0-java \ | ||
17 | android.hardware.wifi-V1.1-java \ | ||
18 | android.hidl.base-V1.0-java \ | ||
19 | |||
20 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
21 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
22 | |||
23 | # | ||
24 | # Build IWifi.hal | ||
25 | # | ||
26 | GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifi.java | ||
27 | $(GEN): $(HIDL) | ||
28 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
29 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal | ||
30 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
31 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
32 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
33 | -Ljava \ | ||
34 | -randroid.hardware:hardware/interfaces \ | ||
35 | -randroid.hidl:system/libhidl/transport \ | ||
36 | android.hardware.wifi@1.2::IWifi | ||
37 | |||
38 | $(GEN): $(LOCAL_PATH)/IWifi.hal | ||
39 | $(transform-generated-source) | ||
40 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
41 | |||
42 | # | ||
43 | # Build IWifiChip.hal | ||
44 | # | ||
45 | GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifiChip.java | ||
46 | $(GEN): $(HIDL) | ||
47 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
48 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal | ||
49 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
50 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
51 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
52 | -Ljava \ | ||
53 | -randroid.hardware:hardware/interfaces \ | ||
54 | -randroid.hidl:system/libhidl/transport \ | ||
55 | android.hardware.wifi@1.2::IWifiChip | ||
56 | |||
57 | $(GEN): $(LOCAL_PATH)/IWifiChip.hal | ||
58 | $(transform-generated-source) | ||
59 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
60 | include $(BUILD_JAVA_LIBRARY) | ||
61 | |||
62 | |||
63 | |||
64 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/wifi/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp index 017fc397..12b2ff6c 100644 --- a/wifi/offload/1.0/Android.bp +++ b/wifi/offload/1.0/Android.bp | |||
@@ -72,6 +72,11 @@ cc_library { | |||
72 | ], | 72 | ], |
73 | } | 73 | } |
74 | 74 | ||
75 | // This package is not java compatible. Not creating java target. | ||
76 | |||
77 | // This package does not export any types. Not creating java constants export. | ||
78 | |||
79 | |||
75 | genrule { | 80 | genrule { |
76 | name: "android.hardware.wifi.offload@1.0-adapter-helper_genc++", | 81 | name: "android.hardware.wifi.offload@1.0-adapter-helper_genc++", |
77 | tools: ["hidl-gen"], | 82 | tools: ["hidl-gen"], |
@@ -98,7 +103,6 @@ genrule { | |||
98 | ], | 103 | ], |
99 | } | 104 | } |
100 | 105 | ||
101 | |||
102 | cc_library { | 106 | cc_library { |
103 | name: "android.hardware.wifi.offload@1.0-adapter-helper", | 107 | name: "android.hardware.wifi.offload@1.0-adapter-helper", |
104 | defaults: ["hidl-module-defaults"], | 108 | defaults: ["hidl-module-defaults"], |
@@ -137,6 +141,7 @@ genrule { | |||
137 | 141 | ||
138 | cc_test { | 142 | cc_test { |
139 | name: "android.hardware.wifi.offload@1.0-adapter", | 143 | name: "android.hardware.wifi.offload@1.0-adapter", |
144 | defaults: ["hidl-module-defaults"], | ||
140 | shared_libs: [ | 145 | shared_libs: [ |
141 | "libhidladapter", | 146 | "libhidladapter", |
142 | "libhidlbase", | 147 | "libhidlbase", |
diff --git a/wifi/supplicant/1.1/Android.bp b/wifi/supplicant/1.1/Android.bp index c232a6c2..9dc65ef2 100644 --- a/wifi/supplicant/1.1/Android.bp +++ b/wifi/supplicant/1.1/Android.bp | |||
@@ -64,6 +64,33 @@ cc_library { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | genrule { | 66 | genrule { |
67 | name: "android.hardware.wifi.supplicant-V1.1-java_gen_java", | ||
68 | tools: ["hidl-gen"], | ||
69 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", | ||
70 | srcs: [ | ||
71 | ":android.hardware.wifi.supplicant@1.1_hal", | ||
72 | ], | ||
73 | out: [ | ||
74 | "android/hardware/wifi/supplicant/V1_1/ISupplicant.java", | ||
75 | ], | ||
76 | } | ||
77 | |||
78 | java_library { | ||
79 | name: "android.hardware.wifi.supplicant-V1.1-java", | ||
80 | no_framework_libs: true, | ||
81 | defaults: ["hidl-java-module-defaults"], | ||
82 | srcs: [":android.hardware.wifi.supplicant-V1.1-java_gen_java"], | ||
83 | libs: [ | ||
84 | "hwbinder", | ||
85 | "android.hardware.wifi.supplicant-V1.0-java", | ||
86 | "android.hidl.base-V1.0-java", | ||
87 | ] | ||
88 | } | ||
89 | |||
90 | // This package does not export any types. Not creating java constants export. | ||
91 | |||
92 | |||
93 | genrule { | ||
67 | name: "android.hardware.wifi.supplicant@1.1-adapter-helper_genc++", | 94 | name: "android.hardware.wifi.supplicant@1.1-adapter-helper_genc++", |
68 | tools: ["hidl-gen"], | 95 | tools: ["hidl-gen"], |
69 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", | 96 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", |
@@ -87,7 +114,6 @@ genrule { | |||
87 | ], | 114 | ], |
88 | } | 115 | } |
89 | 116 | ||
90 | |||
91 | cc_library { | 117 | cc_library { |
92 | name: "android.hardware.wifi.supplicant@1.1-adapter-helper", | 118 | name: "android.hardware.wifi.supplicant@1.1-adapter-helper", |
93 | defaults: ["hidl-module-defaults"], | 119 | defaults: ["hidl-module-defaults"], |
diff --git a/wifi/supplicant/1.1/Android.mk b/wifi/supplicant/1.1/Android.mk deleted file mode 100644 index 198122ed..00000000 --- a/wifi/supplicant/1.1/Android.mk +++ /dev/null | |||
@@ -1,44 +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.wifi.supplicant-V1.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.hardware.wifi.supplicant-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build ISupplicant.hal | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_1/ISupplicant.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.wifi.supplicant@1.1::ISupplicant | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/ISupplicant.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | include $(BUILD_JAVA_LIBRARY) | ||
41 | |||
42 | |||
43 | |||
44 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||