summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--automotive/evs/1.0/Android.bp172
-rw-r--r--automotive/vehicle/2.0/Android.bp213
-rw-r--r--automotive/vehicle/2.0/Android.mk1276
-rw-r--r--broadcastradio/1.1/Android.bp6
-rw-r--r--camera/device/3.3/Android.bp75
-rw-r--r--camera/provider/2.4/Android.bp1
-rw-r--r--cas/1.0/Android.bp88
-rw-r--r--cas/1.0/default/DescramblerImpl.cpp53
-rw-r--r--cas/native/1.0/Android.bp76
-rw-r--r--configstore/1.0/default/Android.mk2
-rw-r--r--current.txt3
-rw-r--r--drm/1.0/vts/functional/drm_hal_clearkey_test.cpp117
-rw-r--r--gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp33
-rw-r--r--graphics/composer/2.1/default/Hwc.cpp2
-rw-r--r--health/2.0/Android.bp186
-rw-r--r--media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp8
-rw-r--r--media/res/bbb_avc_1920x1080_5000kbps_30fps.h264bin3971016 -> 0 bytes
-rw-r--r--media/res/bbb_avc_1920x1080_5000kbps_30fps.info242
-rwxr-xr-xmedia/res/bbb_avc_640x360_768kbps_30fps.h264bin0 -> 574395 bytes
-rwxr-xr-xmedia/res/bbb_avc_640x360_768kbps_30fps.info242
-rw-r--r--media/res/bbb_mpeg4_1280x720_1000kbps_25fps.info251
-rw-r--r--media/res/bbb_mpeg4_1280x720_1000kbps_25fps.m4vbin1420013 -> 0 bytes
-rwxr-xr-xmedia/res/bbb_mpeg4_352x288_512kbps_30fps.info241
-rwxr-xr-xmedia/res/bbb_mpeg4_352x288_512kbps_30fps.m4vbin0 -> 687915 bytes
-rw-r--r--neuralnetworks/1.0/Android.bp100
-rw-r--r--tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp4
-rw-r--r--tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp72
-rw-r--r--thermal/1.1/Android.bp72
-rw-r--r--thermal/1.1/Android.mk65
-rw-r--r--wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp8
-rw-r--r--wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp4
31 files changed, 907 insertions, 2705 deletions
diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp
index da68c2a5..4bc40686 100644
--- a/automotive/evs/1.0/Android.bp
+++ b/automotive/evs/1.0/Android.bp
@@ -1,7 +1,11 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.automotive.evs@1.0_hal", 4 name: "android.hardware.automotive.evs@1.0",
5 root: "android.hardware",
6 vndk: {
7 enabled: true,
8 },
5 srcs: [ 9 srcs: [
6 "types.hal", 10 "types.hal",
7 "IEvsCamera.hal", 11 "IEvsCamera.hal",
@@ -9,160 +13,16 @@ filegroup {
9 "IEvsDisplay.hal", 13 "IEvsDisplay.hal",
10 "IEvsEnumerator.hal", 14 "IEvsEnumerator.hal",
11 ], 15 ],
12} 16 interfaces: [
13 17 "android.hidl.base@1.0",
14genrule {
15 name: "android.hardware.automotive.evs@1.0_genc++",
16 tools: ["hidl-gen"],
17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
18 srcs: [
19 ":android.hardware.automotive.evs@1.0_hal",
20 ],
21 out: [
22 "android/hardware/automotive/evs/1.0/types.cpp",
23 "android/hardware/automotive/evs/1.0/EvsCameraAll.cpp",
24 "android/hardware/automotive/evs/1.0/EvsCameraStreamAll.cpp",
25 "android/hardware/automotive/evs/1.0/EvsDisplayAll.cpp",
26 "android/hardware/automotive/evs/1.0/EvsEnumeratorAll.cpp",
27 ],
28}
29
30genrule {
31 name: "android.hardware.automotive.evs@1.0_genc++_headers",
32 tools: ["hidl-gen"],
33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
34 srcs: [
35 ":android.hardware.automotive.evs@1.0_hal",
36 ],
37 out: [
38 "android/hardware/automotive/evs/1.0/types.h",
39 "android/hardware/automotive/evs/1.0/hwtypes.h",
40 "android/hardware/automotive/evs/1.0/IEvsCamera.h",
41 "android/hardware/automotive/evs/1.0/IHwEvsCamera.h",
42 "android/hardware/automotive/evs/1.0/BnHwEvsCamera.h",
43 "android/hardware/automotive/evs/1.0/BpHwEvsCamera.h",
44 "android/hardware/automotive/evs/1.0/BsEvsCamera.h",
45 "android/hardware/automotive/evs/1.0/IEvsCameraStream.h",
46 "android/hardware/automotive/evs/1.0/IHwEvsCameraStream.h",
47 "android/hardware/automotive/evs/1.0/BnHwEvsCameraStream.h",
48 "android/hardware/automotive/evs/1.0/BpHwEvsCameraStream.h",
49 "android/hardware/automotive/evs/1.0/BsEvsCameraStream.h",
50 "android/hardware/automotive/evs/1.0/IEvsDisplay.h",
51 "android/hardware/automotive/evs/1.0/IHwEvsDisplay.h",
52 "android/hardware/automotive/evs/1.0/BnHwEvsDisplay.h",
53 "android/hardware/automotive/evs/1.0/BpHwEvsDisplay.h",
54 "android/hardware/automotive/evs/1.0/BsEvsDisplay.h",
55 "android/hardware/automotive/evs/1.0/IEvsEnumerator.h",
56 "android/hardware/automotive/evs/1.0/IHwEvsEnumerator.h",
57 "android/hardware/automotive/evs/1.0/BnHwEvsEnumerator.h",
58 "android/hardware/automotive/evs/1.0/BpHwEvsEnumerator.h",
59 "android/hardware/automotive/evs/1.0/BsEvsEnumerator.h",
60 ],
61}
62
63cc_library {
64 name: "android.hardware.automotive.evs@1.0",
65 defaults: ["hidl-module-defaults"],
66 generated_sources: ["android.hardware.automotive.evs@1.0_genc++"],
67 generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
68 export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
69 vendor_available: true,
70 vndk: {
71 enabled: true,
72 },
73 shared_libs: [
74 "libhidlbase",
75 "libhidltransport",
76 "libhwbinder",
77 "liblog",
78 "libutils",
79 "libcutils",
80 ], 18 ],
81 export_shared_lib_headers: [ 19 types: [
82 "libhidlbase", 20 "BufferDesc",
83 "libhidltransport", 21 "CameraDesc",
84 "libhwbinder", 22 "DisplayDesc",
85 "libutils", 23 "DisplayState",
24 "EvsResult",
86 ], 25 ],
26 gen_java: false,
87} 27}
88 28
89genrule {
90 name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++",
91 tools: ["hidl-gen"],
92 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
93 srcs: [
94 ":android.hardware.automotive.evs@1.0_hal",
95 ],
96 out: [
97 "android/hardware/automotive/evs/1.0/AEvsCamera.cpp",
98 "android/hardware/automotive/evs/1.0/AEvsCameraStream.cpp",
99 "android/hardware/automotive/evs/1.0/AEvsDisplay.cpp",
100 "android/hardware/automotive/evs/1.0/AEvsEnumerator.cpp",
101 ],
102}
103
104genrule {
105 name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++_headers",
106 tools: ["hidl-gen"],
107 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
108 srcs: [
109 ":android.hardware.automotive.evs@1.0_hal",
110 ],
111 out: [
112 "android/hardware/automotive/evs/1.0/AEvsCamera.h",
113 "android/hardware/automotive/evs/1.0/AEvsCameraStream.h",
114 "android/hardware/automotive/evs/1.0/AEvsDisplay.h",
115 "android/hardware/automotive/evs/1.0/AEvsEnumerator.h",
116 ],
117}
118
119
120cc_library {
121 name: "android.hardware.automotive.evs@1.0-adapter-helper",
122 defaults: ["hidl-module-defaults"],
123 generated_sources: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++"],
124 generated_headers: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++_headers"],
125 export_generated_headers: ["android.hardware.automotive.evs@1.0-adapter-helper_genc++_headers"],
126 vendor_available: true,
127 shared_libs: [
128 "libhidlbase",
129 "libhidltransport",
130 "libhwbinder",
131 "liblog",
132 "libutils",
133 "libcutils",
134 "libhidladapter",
135 "android.hardware.automotive.evs@1.0",
136 "android.hidl.base@1.0-adapter-helper",
137 ],
138 export_shared_lib_headers: [
139 "libhidlbase",
140 "libhidltransport",
141 "libhwbinder",
142 "libutils",
143 "libhidladapter",
144 "android.hardware.automotive.evs@1.0",
145 "android.hidl.base@1.0-adapter-helper",
146 ],
147}
148
149genrule {
150 name: "android.hardware.automotive.evs@1.0-adapter_genc++",
151 tools: ["hidl-gen"],
152 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.evs@1.0",
153 out: ["main.cpp"]
154}
155
156cc_test {
157 name: "android.hardware.automotive.evs@1.0-adapter",
158 defaults: ["hidl-module-defaults"],
159 shared_libs: [
160 "libhidladapter",
161 "libhidlbase",
162 "libhidltransport",
163 "libutils",
164 "android.hardware.automotive.evs@1.0",
165 "android.hardware.automotive.evs@1.0-adapter-helper",
166 ],
167 generated_sources: ["android.hardware.automotive.evs@1.0-adapter_genc++"],
168}
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index 0d0d28f9..3441a25e 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -1,150 +1,85 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.automotive.vehicle@2.0_hal",
5 srcs: [
6 "types.hal",
7 "IVehicle.hal",
8 "IVehicleCallback.hal",
9 ],
10}
11
12genrule {
13 name: "android.hardware.automotive.vehicle@2.0_genc++",
14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
16 srcs: [
17 ":android.hardware.automotive.vehicle@2.0_hal",
18 ],
19 out: [
20 "android/hardware/automotive/vehicle/2.0/types.cpp",
21 "android/hardware/automotive/vehicle/2.0/VehicleAll.cpp",
22 "android/hardware/automotive/vehicle/2.0/VehicleCallbackAll.cpp",
23 ],
24}
25
26genrule {
27 name: "android.hardware.automotive.vehicle@2.0_genc++_headers",
28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
30 srcs: [
31 ":android.hardware.automotive.vehicle@2.0_hal",
32 ],
33 out: [
34 "android/hardware/automotive/vehicle/2.0/types.h",
35 "android/hardware/automotive/vehicle/2.0/hwtypes.h",
36 "android/hardware/automotive/vehicle/2.0/IVehicle.h",
37 "android/hardware/automotive/vehicle/2.0/IHwVehicle.h",
38 "android/hardware/automotive/vehicle/2.0/BnHwVehicle.h",
39 "android/hardware/automotive/vehicle/2.0/BpHwVehicle.h",
40 "android/hardware/automotive/vehicle/2.0/BsVehicle.h",
41 "android/hardware/automotive/vehicle/2.0/IVehicleCallback.h",
42 "android/hardware/automotive/vehicle/2.0/IHwVehicleCallback.h",
43 "android/hardware/automotive/vehicle/2.0/BnHwVehicleCallback.h",
44 "android/hardware/automotive/vehicle/2.0/BpHwVehicleCallback.h",
45 "android/hardware/automotive/vehicle/2.0/BsVehicleCallback.h",
46 ],
47}
48
49cc_library {
50 name: "android.hardware.automotive.vehicle@2.0", 4 name: "android.hardware.automotive.vehicle@2.0",
51 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
52 generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"],
53 generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
54 export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
55 vendor_available: true,
56 vndk: { 6 vndk: {
57 enabled: true, 7 enabled: true,
58 }, 8 },
59 shared_libs: [
60 "libhidlbase",
61 "libhidltransport",
62 "libhwbinder",
63 "liblog",
64 "libutils",
65 "libcutils",
66 ],
67 export_shared_lib_headers: [
68 "libhidlbase",
69 "libhidltransport",
70 "libhwbinder",
71 "libutils",
72 ],
73}
74
75genrule {
76 name: "android.hardware.automotive.vehicle@2.0-adapter-helper_genc++",
77 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",
79 srcs: [ 9 srcs: [
80 ":android.hardware.automotive.vehicle@2.0_hal", 10 "types.hal",
81 ], 11 "IVehicle.hal",
82 out: [ 12 "IVehicleCallback.hal",
83 "android/hardware/automotive/vehicle/2.0/AVehicle.cpp",
84 "android/hardware/automotive/vehicle/2.0/AVehicleCallback.cpp",
85 ],
86}
87
88genrule {
89 name: "android.hardware.automotive.vehicle@2.0-adapter-helper_genc++_headers",
90 tools: ["hidl-gen"],
91 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
92 srcs: [
93 ":android.hardware.automotive.vehicle@2.0_hal",
94 ],
95 out: [
96 "android/hardware/automotive/vehicle/2.0/AVehicle.h",
97 "android/hardware/automotive/vehicle/2.0/AVehicleCallback.h",
98 ], 13 ],
99} 14 interfaces: [
100 15 "android.hidl.base@1.0",
101
102cc_library {
103 name: "android.hardware.automotive.vehicle@2.0-adapter-helper",
104 defaults: ["hidl-module-defaults"],
105 generated_sources: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++"],
106 generated_headers: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++_headers"],
107 export_generated_headers: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++_headers"],
108 vendor_available: true,
109 shared_libs: [
110 "libhidlbase",
111 "libhidltransport",
112 "libhwbinder",
113 "liblog",
114 "libutils",
115 "libcutils",
116 "libhidladapter",
117 "android.hardware.automotive.vehicle@2.0",
118 "android.hidl.base@1.0-adapter-helper",
119 ], 16 ],
120 export_shared_lib_headers: [ 17 types: [
121 "libhidlbase", 18 "DiagnosticFloatSensorIndex",
122 "libhidltransport", 19 "DiagnosticIntegerSensorIndex",
123 "libhwbinder", 20 "Obd2CommonIgnitionMonitors",
124 "libutils", 21 "Obd2CompressionIgnitionMonitors",
125 "libhidladapter", 22 "Obd2FuelSystemStatus",
126 "android.hardware.automotive.vehicle@2.0", 23 "Obd2FuelType",
127 "android.hidl.base@1.0-adapter-helper", 24 "Obd2IgnitionMonitorKind",
25 "Obd2SecondaryAirStatus",
26 "Obd2SparkIgnitionMonitors",
27 "StatusCode",
28 "SubscribeFlags",
29 "SubscribeOptions",
30 "VehicleApPowerBootupReason",
31 "VehicleApPowerSetState",
32 "VehicleApPowerState",
33 "VehicleApPowerStateConfigFlag",
34 "VehicleApPowerStateIndex",
35 "VehicleApPowerStateShutdownParam",
36 "VehicleArea",
37 "VehicleAreaConfig",
38 "VehicleAreaDoor",
39 "VehicleAreaMirror",
40 "VehicleAreaSeat",
41 "VehicleAreaWindow",
42 "VehicleAreaZone",
43 "VehicleAudioContextFlag",
44 "VehicleAudioExtFocusFlag",
45 "VehicleAudioFocusIndex",
46 "VehicleAudioFocusRequest",
47 "VehicleAudioFocusState",
48 "VehicleAudioHwVariantConfigFlag",
49 "VehicleAudioRoutingPolicyIndex",
50 "VehicleAudioStream",
51 "VehicleAudioStreamFlag",
52 "VehicleAudioVolumeCapabilityFlag",
53 "VehicleAudioVolumeIndex",
54 "VehicleAudioVolumeLimitIndex",
55 "VehicleAudioVolumeState",
56 "VehicleDisplay",
57 "VehicleDrivingStatus",
58 "VehicleGear",
59 "VehicleHvacFanDirection",
60 "VehicleHwKeyInputAction",
61 "VehicleIgnitionState",
62 "VehicleInstrumentClusterType",
63 "VehiclePropConfig",
64 "VehiclePropValue",
65 "VehicleProperty",
66 "VehiclePropertyAccess",
67 "VehiclePropertyChangeMode",
68 "VehiclePropertyGroup",
69 "VehiclePropertyOperation",
70 "VehiclePropertyType",
71 "VehicleRadioConstants",
72 "VehicleTurnSignal",
73 "VehicleUnit",
74 "VmsAvailabilityStateIntegerValuesIndex",
75 "VmsBaseMessageIntegerValuesIndex",
76 "VmsMessageType",
77 "VmsMessageWithLayerAndPublisherIdIntegerValuesIndex",
78 "VmsMessageWithLayerIntegerValuesIndex",
79 "VmsOfferingMessageIntegerValuesIndex",
80 "VmsSubscriptionsStateIntegerValuesIndex",
81 "Wheel",
128 ], 82 ],
83 gen_java: true,
129} 84}
130 85
131genrule {
132 name: "android.hardware.automotive.vehicle@2.0-adapter_genc++",
133 tools: ["hidl-gen"],
134 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
135 out: ["main.cpp"]
136}
137
138cc_test {
139 name: "android.hardware.automotive.vehicle@2.0-adapter",
140 defaults: ["hidl-module-defaults"],
141 shared_libs: [
142 "libhidladapter",
143 "libhidlbase",
144 "libhidltransport",
145 "libutils",
146 "android.hardware.automotive.vehicle@2.0",
147 "android.hardware.automotive.vehicle@2.0-adapter-helper",
148 ],
149 generated_sources: ["android.hardware.automotive.vehicle@2.0-adapter_genc++"],
150}
diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk
index 59194874..a731d6d5 100644
--- a/automotive/vehicle/2.0/Android.mk
+++ b/automotive/vehicle/2.0/Android.mk
@@ -5,1282 +5,6 @@ LOCAL_PATH := $(call my-dir)
5################################################################################ 5################################################################################
6 6
7include $(CLEAR_VARS) 7include $(CLEAR_VARS)
8LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java
9LOCAL_MODULE_CLASS := JAVA_LIBRARIES
10
11intermediates := $(call local-generated-sources-dir, COMMON)
12
13HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
14
15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \
17
18
19#
20# Build types.hal (DiagnosticFloatSensorIndex)
21#
22GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java
23$(GEN): $(HIDL)
24$(GEN): PRIVATE_HIDL := $(HIDL)
25$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
26$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
27$(GEN): PRIVATE_CUSTOM_TOOL = \
28 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
29 -Ljava \
30 -randroid.hardware:hardware/interfaces \
31 -randroid.hidl:system/libhidl/transport \
32 android.hardware.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex
33
34$(GEN): $(LOCAL_PATH)/types.hal
35 $(transform-generated-source)
36LOCAL_GENERATED_SOURCES += $(GEN)
37
38#
39# Build types.hal (DiagnosticIntegerSensorIndex)
40#
41GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java
42$(GEN): $(HIDL)
43$(GEN): PRIVATE_HIDL := $(HIDL)
44$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
45$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
46$(GEN): PRIVATE_CUSTOM_TOOL = \
47 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
48 -Ljava \
49 -randroid.hardware:hardware/interfaces \
50 -randroid.hidl:system/libhidl/transport \
51 android.hardware.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex
52
53$(GEN): $(LOCAL_PATH)/types.hal
54 $(transform-generated-source)
55LOCAL_GENERATED_SOURCES += $(GEN)
56
57#
58# Build types.hal (Obd2CommonIgnitionMonitors)
59#
60GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java
61$(GEN): $(HIDL)
62$(GEN): PRIVATE_HIDL := $(HIDL)
63$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
64$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
65$(GEN): PRIVATE_CUSTOM_TOOL = \
66 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
67 -Ljava \
68 -randroid.hardware:hardware/interfaces \
69 -randroid.hidl:system/libhidl/transport \
70 android.hardware.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors
71
72$(GEN): $(LOCAL_PATH)/types.hal
73 $(transform-generated-source)
74LOCAL_GENERATED_SOURCES += $(GEN)
75
76#
77# Build types.hal (Obd2CompressionIgnitionMonitors)
78#
79GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java
80$(GEN): $(HIDL)
81$(GEN): PRIVATE_HIDL := $(HIDL)
82$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
83$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
84$(GEN): PRIVATE_CUSTOM_TOOL = \
85 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
86 -Ljava \
87 -randroid.hardware:hardware/interfaces \
88 -randroid.hidl:system/libhidl/transport \
89 android.hardware.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors
90
91$(GEN): $(LOCAL_PATH)/types.hal
92 $(transform-generated-source)
93LOCAL_GENERATED_SOURCES += $(GEN)
94
95#
96# Build types.hal (Obd2FuelSystemStatus)
97#
98GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java
99$(GEN): $(HIDL)
100$(GEN): PRIVATE_HIDL := $(HIDL)
101$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
102$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
103$(GEN): PRIVATE_CUSTOM_TOOL = \
104 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
105 -Ljava \
106 -randroid.hardware:hardware/interfaces \
107 -randroid.hidl:system/libhidl/transport \
108 android.hardware.automotive.vehicle@2.0::types.Obd2FuelSystemStatus
109
110$(GEN): $(LOCAL_PATH)/types.hal
111 $(transform-generated-source)
112LOCAL_GENERATED_SOURCES += $(GEN)
113
114#
115# Build types.hal (Obd2FuelType)
116#
117GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java
118$(GEN): $(HIDL)
119$(GEN): PRIVATE_HIDL := $(HIDL)
120$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
121$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
122$(GEN): PRIVATE_CUSTOM_TOOL = \
123 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
124 -Ljava \
125 -randroid.hardware:hardware/interfaces \
126 -randroid.hidl:system/libhidl/transport \
127 android.hardware.automotive.vehicle@2.0::types.Obd2FuelType
128
129$(GEN): $(LOCAL_PATH)/types.hal
130 $(transform-generated-source)
131LOCAL_GENERATED_SOURCES += $(GEN)
132
133#
134# Build types.hal (Obd2IgnitionMonitorKind)
135#
136GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java
137$(GEN): $(HIDL)
138$(GEN): PRIVATE_HIDL := $(HIDL)
139$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
140$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
141$(GEN): PRIVATE_CUSTOM_TOOL = \
142 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
143 -Ljava \
144 -randroid.hardware:hardware/interfaces \
145 -randroid.hidl:system/libhidl/transport \
146 android.hardware.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind
147
148$(GEN): $(LOCAL_PATH)/types.hal
149 $(transform-generated-source)
150LOCAL_GENERATED_SOURCES += $(GEN)
151
152#
153# Build types.hal (Obd2SecondaryAirStatus)
154#
155GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java
156$(GEN): $(HIDL)
157$(GEN): PRIVATE_HIDL := $(HIDL)
158$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
159$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
160$(GEN): PRIVATE_CUSTOM_TOOL = \
161 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
162 -Ljava \
163 -randroid.hardware:hardware/interfaces \
164 -randroid.hidl:system/libhidl/transport \
165 android.hardware.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus
166
167$(GEN): $(LOCAL_PATH)/types.hal
168 $(transform-generated-source)
169LOCAL_GENERATED_SOURCES += $(GEN)
170
171#
172# Build types.hal (Obd2SparkIgnitionMonitors)
173#
174GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java
175$(GEN): $(HIDL)
176$(GEN): PRIVATE_HIDL := $(HIDL)
177$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
178$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
179$(GEN): PRIVATE_CUSTOM_TOOL = \
180 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
181 -Ljava \
182 -randroid.hardware:hardware/interfaces \
183 -randroid.hidl:system/libhidl/transport \
184 android.hardware.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors
185
186$(GEN): $(LOCAL_PATH)/types.hal
187 $(transform-generated-source)
188LOCAL_GENERATED_SOURCES += $(GEN)
189
190#
191# Build types.hal (StatusCode)
192#
193GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.java
194$(GEN): $(HIDL)
195$(GEN): PRIVATE_HIDL := $(HIDL)
196$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
197$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
198$(GEN): PRIVATE_CUSTOM_TOOL = \
199 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
200 -Ljava \
201 -randroid.hardware:hardware/interfaces \
202 -randroid.hidl:system/libhidl/transport \
203 android.hardware.automotive.vehicle@2.0::types.StatusCode
204
205$(GEN): $(LOCAL_PATH)/types.hal
206 $(transform-generated-source)
207LOCAL_GENERATED_SOURCES += $(GEN)
208
209#
210# Build types.hal (SubscribeFlags)
211#
212GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java
213$(GEN): $(HIDL)
214$(GEN): PRIVATE_HIDL := $(HIDL)
215$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
216$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
217$(GEN): PRIVATE_CUSTOM_TOOL = \
218 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
219 -Ljava \
220 -randroid.hardware:hardware/interfaces \
221 -randroid.hidl:system/libhidl/transport \
222 android.hardware.automotive.vehicle@2.0::types.SubscribeFlags
223
224$(GEN): $(LOCAL_PATH)/types.hal
225 $(transform-generated-source)
226LOCAL_GENERATED_SOURCES += $(GEN)
227
228#
229# Build types.hal (SubscribeOptions)
230#
231GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java
232$(GEN): $(HIDL)
233$(GEN): PRIVATE_HIDL := $(HIDL)
234$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
235$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
236$(GEN): PRIVATE_CUSTOM_TOOL = \
237 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
238 -Ljava \
239 -randroid.hardware:hardware/interfaces \
240 -randroid.hidl:system/libhidl/transport \
241 android.hardware.automotive.vehicle@2.0::types.SubscribeOptions
242
243$(GEN): $(LOCAL_PATH)/types.hal
244 $(transform-generated-source)
245LOCAL_GENERATED_SOURCES += $(GEN)
246
247#
248# Build types.hal (VehicleApPowerBootupReason)
249#
250GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java
251$(GEN): $(HIDL)
252$(GEN): PRIVATE_HIDL := $(HIDL)
253$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
254$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
255$(GEN): PRIVATE_CUSTOM_TOOL = \
256 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
257 -Ljava \
258 -randroid.hardware:hardware/interfaces \
259 -randroid.hidl:system/libhidl/transport \
260 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerBootupReason
261
262$(GEN): $(LOCAL_PATH)/types.hal
263 $(transform-generated-source)
264LOCAL_GENERATED_SOURCES += $(GEN)
265
266#
267# Build types.hal (VehicleApPowerSetState)
268#
269GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java
270$(GEN): $(HIDL)
271$(GEN): PRIVATE_HIDL := $(HIDL)
272$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
273$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
274$(GEN): PRIVATE_CUSTOM_TOOL = \
275 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
276 -Ljava \
277 -randroid.hardware:hardware/interfaces \
278 -randroid.hidl:system/libhidl/transport \
279 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerSetState
280
281$(GEN): $(LOCAL_PATH)/types.hal
282 $(transform-generated-source)
283LOCAL_GENERATED_SOURCES += $(GEN)
284
285#
286# Build types.hal (VehicleApPowerState)
287#
288GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java
289$(GEN): $(HIDL)
290$(GEN): PRIVATE_HIDL := $(HIDL)
291$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
292$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
293$(GEN): PRIVATE_CUSTOM_TOOL = \
294 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
295 -Ljava \
296 -randroid.hardware:hardware/interfaces \
297 -randroid.hidl:system/libhidl/transport \
298 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerState
299
300$(GEN): $(LOCAL_PATH)/types.hal
301 $(transform-generated-source)
302LOCAL_GENERATED_SOURCES += $(GEN)
303
304#
305# Build types.hal (VehicleApPowerStateConfigFlag)
306#
307GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
308$(GEN): $(HIDL)
309$(GEN): PRIVATE_HIDL := $(HIDL)
310$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
311$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
312$(GEN): PRIVATE_CUSTOM_TOOL = \
313 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
314 -Ljava \
315 -randroid.hardware:hardware/interfaces \
316 -randroid.hidl:system/libhidl/transport \
317 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag
318
319$(GEN): $(LOCAL_PATH)/types.hal
320 $(transform-generated-source)
321LOCAL_GENERATED_SOURCES += $(GEN)
322
323#
324# Build types.hal (VehicleApPowerStateIndex)
325#
326GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java
327$(GEN): $(HIDL)
328$(GEN): PRIVATE_HIDL := $(HIDL)
329$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
330$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
331$(GEN): PRIVATE_CUSTOM_TOOL = \
332 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
333 -Ljava \
334 -randroid.hardware:hardware/interfaces \
335 -randroid.hidl:system/libhidl/transport \
336 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateIndex
337
338$(GEN): $(LOCAL_PATH)/types.hal
339 $(transform-generated-source)
340LOCAL_GENERATED_SOURCES += $(GEN)
341
342#
343# Build types.hal (VehicleApPowerStateShutdownParam)
344#
345GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
346$(GEN): $(HIDL)
347$(GEN): PRIVATE_HIDL := $(HIDL)
348$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
349$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
350$(GEN): PRIVATE_CUSTOM_TOOL = \
351 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
352 -Ljava \
353 -randroid.hardware:hardware/interfaces \
354 -randroid.hidl:system/libhidl/transport \
355 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam
356
357$(GEN): $(LOCAL_PATH)/types.hal
358 $(transform-generated-source)
359LOCAL_GENERATED_SOURCES += $(GEN)
360
361#
362# Build types.hal (VehicleArea)
363#
364GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.java
365$(GEN): $(HIDL)
366$(GEN): PRIVATE_HIDL := $(HIDL)
367$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
368$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
369$(GEN): PRIVATE_CUSTOM_TOOL = \
370 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
371 -Ljava \
372 -randroid.hardware:hardware/interfaces \
373 -randroid.hidl:system/libhidl/transport \
374 android.hardware.automotive.vehicle@2.0::types.VehicleArea
375
376$(GEN): $(LOCAL_PATH)/types.hal
377 $(transform-generated-source)
378LOCAL_GENERATED_SOURCES += $(GEN)
379
380#
381# Build types.hal (VehicleAreaConfig)
382#
383GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java
384$(GEN): $(HIDL)
385$(GEN): PRIVATE_HIDL := $(HIDL)
386$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
387$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
388$(GEN): PRIVATE_CUSTOM_TOOL = \
389 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
390 -Ljava \
391 -randroid.hardware:hardware/interfaces \
392 -randroid.hidl:system/libhidl/transport \
393 android.hardware.automotive.vehicle@2.0::types.VehicleAreaConfig
394
395$(GEN): $(LOCAL_PATH)/types.hal
396 $(transform-generated-source)
397LOCAL_GENERATED_SOURCES += $(GEN)
398
399#
400# Build types.hal (VehicleAreaDoor)
401#
402GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java
403$(GEN): $(HIDL)
404$(GEN): PRIVATE_HIDL := $(HIDL)
405$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
406$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
407$(GEN): PRIVATE_CUSTOM_TOOL = \
408 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
409 -Ljava \
410 -randroid.hardware:hardware/interfaces \
411 -randroid.hidl:system/libhidl/transport \
412 android.hardware.automotive.vehicle@2.0::types.VehicleAreaDoor
413
414$(GEN): $(LOCAL_PATH)/types.hal
415 $(transform-generated-source)
416LOCAL_GENERATED_SOURCES += $(GEN)
417
418#
419# Build types.hal (VehicleAreaMirror)
420#
421GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java
422$(GEN): $(HIDL)
423$(GEN): PRIVATE_HIDL := $(HIDL)
424$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
425$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
426$(GEN): PRIVATE_CUSTOM_TOOL = \
427 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
428 -Ljava \
429 -randroid.hardware:hardware/interfaces \
430 -randroid.hidl:system/libhidl/transport \
431 android.hardware.automotive.vehicle@2.0::types.VehicleAreaMirror
432
433$(GEN): $(LOCAL_PATH)/types.hal
434 $(transform-generated-source)
435LOCAL_GENERATED_SOURCES += $(GEN)
436
437#
438# Build types.hal (VehicleAreaSeat)
439#
440GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java
441$(GEN): $(HIDL)
442$(GEN): PRIVATE_HIDL := $(HIDL)
443$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
444$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
445$(GEN): PRIVATE_CUSTOM_TOOL = \
446 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
447 -Ljava \
448 -randroid.hardware:hardware/interfaces \
449 -randroid.hidl:system/libhidl/transport \
450 android.hardware.automotive.vehicle@2.0::types.VehicleAreaSeat
451
452$(GEN): $(LOCAL_PATH)/types.hal
453 $(transform-generated-source)
454LOCAL_GENERATED_SOURCES += $(GEN)
455
456#
457# Build types.hal (VehicleAreaWindow)
458#
459GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java
460$(GEN): $(HIDL)
461$(GEN): PRIVATE_HIDL := $(HIDL)
462$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
463$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
464$(GEN): PRIVATE_CUSTOM_TOOL = \
465 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
466 -Ljava \
467 -randroid.hardware:hardware/interfaces \
468 -randroid.hidl:system/libhidl/transport \
469 android.hardware.automotive.vehicle@2.0::types.VehicleAreaWindow
470
471$(GEN): $(LOCAL_PATH)/types.hal
472 $(transform-generated-source)
473LOCAL_GENERATED_SOURCES += $(GEN)
474
475#
476# Build types.hal (VehicleAreaZone)
477#
478GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java
479$(GEN): $(HIDL)
480$(GEN): PRIVATE_HIDL := $(HIDL)
481$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
482$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
483$(GEN): PRIVATE_CUSTOM_TOOL = \
484 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
485 -Ljava \
486 -randroid.hardware:hardware/interfaces \
487 -randroid.hidl:system/libhidl/transport \
488 android.hardware.automotive.vehicle@2.0::types.VehicleAreaZone
489
490$(GEN): $(LOCAL_PATH)/types.hal
491 $(transform-generated-source)
492LOCAL_GENERATED_SOURCES += $(GEN)
493
494#
495# Build types.hal (VehicleAudioContextFlag)
496#
497GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java
498$(GEN): $(HIDL)
499$(GEN): PRIVATE_HIDL := $(HIDL)
500$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
501$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
502$(GEN): PRIVATE_CUSTOM_TOOL = \
503 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
504 -Ljava \
505 -randroid.hardware:hardware/interfaces \
506 -randroid.hidl:system/libhidl/transport \
507 android.hardware.automotive.vehicle@2.0::types.VehicleAudioContextFlag
508
509$(GEN): $(LOCAL_PATH)/types.hal
510 $(transform-generated-source)
511LOCAL_GENERATED_SOURCES += $(GEN)
512
513#
514# Build types.hal (VehicleAudioExtFocusFlag)
515#
516GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java
517$(GEN): $(HIDL)
518$(GEN): PRIVATE_HIDL := $(HIDL)
519$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
520$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
521$(GEN): PRIVATE_CUSTOM_TOOL = \
522 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
523 -Ljava \
524 -randroid.hardware:hardware/interfaces \
525 -randroid.hidl:system/libhidl/transport \
526 android.hardware.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag
527
528$(GEN): $(LOCAL_PATH)/types.hal
529 $(transform-generated-source)
530LOCAL_GENERATED_SOURCES += $(GEN)
531
532#
533# Build types.hal (VehicleAudioFocusIndex)
534#
535GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java
536$(GEN): $(HIDL)
537$(GEN): PRIVATE_HIDL := $(HIDL)
538$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
539$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
540$(GEN): PRIVATE_CUSTOM_TOOL = \
541 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
542 -Ljava \
543 -randroid.hardware:hardware/interfaces \
544 -randroid.hidl:system/libhidl/transport \
545 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusIndex
546
547$(GEN): $(LOCAL_PATH)/types.hal
548 $(transform-generated-source)
549LOCAL_GENERATED_SOURCES += $(GEN)
550
551#
552# Build types.hal (VehicleAudioFocusRequest)
553#
554GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java
555$(GEN): $(HIDL)
556$(GEN): PRIVATE_HIDL := $(HIDL)
557$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
558$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
559$(GEN): PRIVATE_CUSTOM_TOOL = \
560 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
561 -Ljava \
562 -randroid.hardware:hardware/interfaces \
563 -randroid.hidl:system/libhidl/transport \
564 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusRequest
565
566$(GEN): $(LOCAL_PATH)/types.hal
567 $(transform-generated-source)
568LOCAL_GENERATED_SOURCES += $(GEN)
569
570#
571# Build types.hal (VehicleAudioFocusState)
572#
573GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java
574$(GEN): $(HIDL)
575$(GEN): PRIVATE_HIDL := $(HIDL)
576$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
577$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
578$(GEN): PRIVATE_CUSTOM_TOOL = \
579 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
580 -Ljava \
581 -randroid.hardware:hardware/interfaces \
582 -randroid.hidl:system/libhidl/transport \
583 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusState
584
585$(GEN): $(LOCAL_PATH)/types.hal
586 $(transform-generated-source)
587LOCAL_GENERATED_SOURCES += $(GEN)
588
589#
590# Build types.hal (VehicleAudioHwVariantConfigFlag)
591#
592GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
593$(GEN): $(HIDL)
594$(GEN): PRIVATE_HIDL := $(HIDL)
595$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
596$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
597$(GEN): PRIVATE_CUSTOM_TOOL = \
598 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
599 -Ljava \
600 -randroid.hardware:hardware/interfaces \
601 -randroid.hidl:system/libhidl/transport \
602 android.hardware.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
603
604$(GEN): $(LOCAL_PATH)/types.hal
605 $(transform-generated-source)
606LOCAL_GENERATED_SOURCES += $(GEN)
607
608#
609# Build types.hal (VehicleAudioRoutingPolicyIndex)
610#
611GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
612$(GEN): $(HIDL)
613$(GEN): PRIVATE_HIDL := $(HIDL)
614$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
615$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
616$(GEN): PRIVATE_CUSTOM_TOOL = \
617 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
618 -Ljava \
619 -randroid.hardware:hardware/interfaces \
620 -randroid.hidl:system/libhidl/transport \
621 android.hardware.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
622
623$(GEN): $(LOCAL_PATH)/types.hal
624 $(transform-generated-source)
625LOCAL_GENERATED_SOURCES += $(GEN)
626
627#
628# Build types.hal (VehicleAudioStream)
629#
630GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java
631$(GEN): $(HIDL)
632$(GEN): PRIVATE_HIDL := $(HIDL)
633$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
634$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
635$(GEN): PRIVATE_CUSTOM_TOOL = \
636 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
637 -Ljava \
638 -randroid.hardware:hardware/interfaces \
639 -randroid.hidl:system/libhidl/transport \
640 android.hardware.automotive.vehicle@2.0::types.VehicleAudioStream
641
642$(GEN): $(LOCAL_PATH)/types.hal
643 $(transform-generated-source)
644LOCAL_GENERATED_SOURCES += $(GEN)
645
646#
647# Build types.hal (VehicleAudioStreamFlag)
648#
649GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java
650$(GEN): $(HIDL)
651$(GEN): PRIVATE_HIDL := $(HIDL)
652$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
653$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
654$(GEN): PRIVATE_CUSTOM_TOOL = \
655 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
656 -Ljava \
657 -randroid.hardware:hardware/interfaces \
658 -randroid.hidl:system/libhidl/transport \
659 android.hardware.automotive.vehicle@2.0::types.VehicleAudioStreamFlag
660
661$(GEN): $(LOCAL_PATH)/types.hal
662 $(transform-generated-source)
663LOCAL_GENERATED_SOURCES += $(GEN)
664
665#
666# Build types.hal (VehicleAudioVolumeCapabilityFlag)
667#
668GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
669$(GEN): $(HIDL)
670$(GEN): PRIVATE_HIDL := $(HIDL)
671$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
672$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
673$(GEN): PRIVATE_CUSTOM_TOOL = \
674 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
675 -Ljava \
676 -randroid.hardware:hardware/interfaces \
677 -randroid.hidl:system/libhidl/transport \
678 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
679
680$(GEN): $(LOCAL_PATH)/types.hal
681 $(transform-generated-source)
682LOCAL_GENERATED_SOURCES += $(GEN)
683
684#
685# Build types.hal (VehicleAudioVolumeIndex)
686#
687GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java
688$(GEN): $(HIDL)
689$(GEN): PRIVATE_HIDL := $(HIDL)
690$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
691$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
692$(GEN): PRIVATE_CUSTOM_TOOL = \
693 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
694 -Ljava \
695 -randroid.hardware:hardware/interfaces \
696 -randroid.hidl:system/libhidl/transport \
697 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex
698
699$(GEN): $(LOCAL_PATH)/types.hal
700 $(transform-generated-source)
701LOCAL_GENERATED_SOURCES += $(GEN)
702
703#
704# Build types.hal (VehicleAudioVolumeLimitIndex)
705#
706GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
707$(GEN): $(HIDL)
708$(GEN): PRIVATE_HIDL := $(HIDL)
709$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
710$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
711$(GEN): PRIVATE_CUSTOM_TOOL = \
712 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
713 -Ljava \
714 -randroid.hardware:hardware/interfaces \
715 -randroid.hidl:system/libhidl/transport \
716 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
717
718$(GEN): $(LOCAL_PATH)/types.hal
719 $(transform-generated-source)
720LOCAL_GENERATED_SOURCES += $(GEN)
721
722#
723# Build types.hal (VehicleAudioVolumeState)
724#
725GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java
726$(GEN): $(HIDL)
727$(GEN): PRIVATE_HIDL := $(HIDL)
728$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
729$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
730$(GEN): PRIVATE_CUSTOM_TOOL = \
731 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
732 -Ljava \
733 -randroid.hardware:hardware/interfaces \
734 -randroid.hidl:system/libhidl/transport \
735 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeState
736
737$(GEN): $(LOCAL_PATH)/types.hal
738 $(transform-generated-source)
739LOCAL_GENERATED_SOURCES += $(GEN)
740
741#
742# Build types.hal (VehicleDisplay)
743#
744GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java
745$(GEN): $(HIDL)
746$(GEN): PRIVATE_HIDL := $(HIDL)
747$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
748$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
749$(GEN): PRIVATE_CUSTOM_TOOL = \
750 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
751 -Ljava \
752 -randroid.hardware:hardware/interfaces \
753 -randroid.hidl:system/libhidl/transport \
754 android.hardware.automotive.vehicle@2.0::types.VehicleDisplay
755
756$(GEN): $(LOCAL_PATH)/types.hal
757 $(transform-generated-source)
758LOCAL_GENERATED_SOURCES += $(GEN)
759
760#
761# Build types.hal (VehicleDrivingStatus)
762#
763GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java
764$(GEN): $(HIDL)
765$(GEN): PRIVATE_HIDL := $(HIDL)
766$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
767$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
768$(GEN): PRIVATE_CUSTOM_TOOL = \
769 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
770 -Ljava \
771 -randroid.hardware:hardware/interfaces \
772 -randroid.hidl:system/libhidl/transport \
773 android.hardware.automotive.vehicle@2.0::types.VehicleDrivingStatus
774
775$(GEN): $(LOCAL_PATH)/types.hal
776 $(transform-generated-source)
777LOCAL_GENERATED_SOURCES += $(GEN)
778
779#
780# Build types.hal (VehicleGear)
781#
782GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.java
783$(GEN): $(HIDL)
784$(GEN): PRIVATE_HIDL := $(HIDL)
785$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
786$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
787$(GEN): PRIVATE_CUSTOM_TOOL = \
788 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
789 -Ljava \
790 -randroid.hardware:hardware/interfaces \
791 -randroid.hidl:system/libhidl/transport \
792 android.hardware.automotive.vehicle@2.0::types.VehicleGear
793
794$(GEN): $(LOCAL_PATH)/types.hal
795 $(transform-generated-source)
796LOCAL_GENERATED_SOURCES += $(GEN)
797
798#
799# Build types.hal (VehicleHvacFanDirection)
800#
801GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java
802$(GEN): $(HIDL)
803$(GEN): PRIVATE_HIDL := $(HIDL)
804$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
805$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
806$(GEN): PRIVATE_CUSTOM_TOOL = \
807 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
808 -Ljava \
809 -randroid.hardware:hardware/interfaces \
810 -randroid.hidl:system/libhidl/transport \
811 android.hardware.automotive.vehicle@2.0::types.VehicleHvacFanDirection
812
813$(GEN): $(LOCAL_PATH)/types.hal
814 $(transform-generated-source)
815LOCAL_GENERATED_SOURCES += $(GEN)
816
817#
818# Build types.hal (VehicleHwKeyInputAction)
819#
820GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java
821$(GEN): $(HIDL)
822$(GEN): PRIVATE_HIDL := $(HIDL)
823$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
824$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
825$(GEN): PRIVATE_CUSTOM_TOOL = \
826 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
827 -Ljava \
828 -randroid.hardware:hardware/interfaces \
829 -randroid.hidl:system/libhidl/transport \
830 android.hardware.automotive.vehicle@2.0::types.VehicleHwKeyInputAction
831
832$(GEN): $(LOCAL_PATH)/types.hal
833 $(transform-generated-source)
834LOCAL_GENERATED_SOURCES += $(GEN)
835
836#
837# Build types.hal (VehicleIgnitionState)
838#
839GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java
840$(GEN): $(HIDL)
841$(GEN): PRIVATE_HIDL := $(HIDL)
842$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
843$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
844$(GEN): PRIVATE_CUSTOM_TOOL = \
845 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
846 -Ljava \
847 -randroid.hardware:hardware/interfaces \
848 -randroid.hidl:system/libhidl/transport \
849 android.hardware.automotive.vehicle@2.0::types.VehicleIgnitionState
850
851$(GEN): $(LOCAL_PATH)/types.hal
852 $(transform-generated-source)
853LOCAL_GENERATED_SOURCES += $(GEN)
854
855#
856# Build types.hal (VehicleInstrumentClusterType)
857#
858GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java
859$(GEN): $(HIDL)
860$(GEN): PRIVATE_HIDL := $(HIDL)
861$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
862$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
863$(GEN): PRIVATE_CUSTOM_TOOL = \
864 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
865 -Ljava \
866 -randroid.hardware:hardware/interfaces \
867 -randroid.hidl:system/libhidl/transport \
868 android.hardware.automotive.vehicle@2.0::types.VehicleInstrumentClusterType
869
870$(GEN): $(LOCAL_PATH)/types.hal
871 $(transform-generated-source)
872LOCAL_GENERATED_SOURCES += $(GEN)
873
874#
875# Build types.hal (VehiclePropConfig)
876#
877GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java
878$(GEN): $(HIDL)
879$(GEN): PRIVATE_HIDL := $(HIDL)
880$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
881$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
882$(GEN): PRIVATE_CUSTOM_TOOL = \
883 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
884 -Ljava \
885 -randroid.hardware:hardware/interfaces \
886 -randroid.hidl:system/libhidl/transport \
887 android.hardware.automotive.vehicle@2.0::types.VehiclePropConfig
888
889$(GEN): $(LOCAL_PATH)/types.hal
890 $(transform-generated-source)
891LOCAL_GENERATED_SOURCES += $(GEN)
892
893#
894# Build types.hal (VehiclePropValue)
895#
896GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java
897$(GEN): $(HIDL)
898$(GEN): PRIVATE_HIDL := $(HIDL)
899$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
900$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
901$(GEN): PRIVATE_CUSTOM_TOOL = \
902 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
903 -Ljava \
904 -randroid.hardware:hardware/interfaces \
905 -randroid.hidl:system/libhidl/transport \
906 android.hardware.automotive.vehicle@2.0::types.VehiclePropValue
907
908$(GEN): $(LOCAL_PATH)/types.hal
909 $(transform-generated-source)
910LOCAL_GENERATED_SOURCES += $(GEN)
911
912#
913# Build types.hal (VehicleProperty)
914#
915GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.java
916$(GEN): $(HIDL)
917$(GEN): PRIVATE_HIDL := $(HIDL)
918$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
919$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
920$(GEN): PRIVATE_CUSTOM_TOOL = \
921 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
922 -Ljava \
923 -randroid.hardware:hardware/interfaces \
924 -randroid.hidl:system/libhidl/transport \
925 android.hardware.automotive.vehicle@2.0::types.VehicleProperty
926
927$(GEN): $(LOCAL_PATH)/types.hal
928 $(transform-generated-source)
929LOCAL_GENERATED_SOURCES += $(GEN)
930
931#
932# Build types.hal (VehiclePropertyAccess)
933#
934GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java
935$(GEN): $(HIDL)
936$(GEN): PRIVATE_HIDL := $(HIDL)
937$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
938$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
939$(GEN): PRIVATE_CUSTOM_TOOL = \
940 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
941 -Ljava \
942 -randroid.hardware:hardware/interfaces \
943 -randroid.hidl:system/libhidl/transport \
944 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyAccess
945
946$(GEN): $(LOCAL_PATH)/types.hal
947 $(transform-generated-source)
948LOCAL_GENERATED_SOURCES += $(GEN)
949
950#
951# Build types.hal (VehiclePropertyChangeMode)
952#
953GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java
954$(GEN): $(HIDL)
955$(GEN): PRIVATE_HIDL := $(HIDL)
956$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
957$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
958$(GEN): PRIVATE_CUSTOM_TOOL = \
959 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
960 -Ljava \
961 -randroid.hardware:hardware/interfaces \
962 -randroid.hidl:system/libhidl/transport \
963 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyChangeMode
964
965$(GEN): $(LOCAL_PATH)/types.hal
966 $(transform-generated-source)
967LOCAL_GENERATED_SOURCES += $(GEN)
968
969#
970# Build types.hal (VehiclePropertyGroup)
971#
972GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java
973$(GEN): $(HIDL)
974$(GEN): PRIVATE_HIDL := $(HIDL)
975$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
976$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
977$(GEN): PRIVATE_CUSTOM_TOOL = \
978 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
979 -Ljava \
980 -randroid.hardware:hardware/interfaces \
981 -randroid.hidl:system/libhidl/transport \
982 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyGroup
983
984$(GEN): $(LOCAL_PATH)/types.hal
985 $(transform-generated-source)
986LOCAL_GENERATED_SOURCES += $(GEN)
987
988#
989# Build types.hal (VehiclePropertyOperation)
990#
991GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java
992$(GEN): $(HIDL)
993$(GEN): PRIVATE_HIDL := $(HIDL)
994$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
995$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
996$(GEN): PRIVATE_CUSTOM_TOOL = \
997 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
998 -Ljava \
999 -randroid.hardware:hardware/interfaces \
1000 -randroid.hidl:system/libhidl/transport \
1001 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyOperation
1002
1003$(GEN): $(LOCAL_PATH)/types.hal
1004 $(transform-generated-source)
1005LOCAL_GENERATED_SOURCES += $(GEN)
1006
1007#
1008# Build types.hal (VehiclePropertyType)
1009#
1010GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java
1011$(GEN): $(HIDL)
1012$(GEN): PRIVATE_HIDL := $(HIDL)
1013$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1014$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1015$(GEN): PRIVATE_CUSTOM_TOOL = \
1016 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1017 -Ljava \
1018 -randroid.hardware:hardware/interfaces \
1019 -randroid.hidl:system/libhidl/transport \
1020 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyType
1021
1022$(GEN): $(LOCAL_PATH)/types.hal
1023 $(transform-generated-source)
1024LOCAL_GENERATED_SOURCES += $(GEN)
1025
1026#
1027# Build types.hal (VehicleRadioConstants)
1028#
1029GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java
1030$(GEN): $(HIDL)
1031$(GEN): PRIVATE_HIDL := $(HIDL)
1032$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1033$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1034$(GEN): PRIVATE_CUSTOM_TOOL = \
1035 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1036 -Ljava \
1037 -randroid.hardware:hardware/interfaces \
1038 -randroid.hidl:system/libhidl/transport \
1039 android.hardware.automotive.vehicle@2.0::types.VehicleRadioConstants
1040
1041$(GEN): $(LOCAL_PATH)/types.hal
1042 $(transform-generated-source)
1043LOCAL_GENERATED_SOURCES += $(GEN)
1044
1045#
1046# Build types.hal (VehicleTurnSignal)
1047#
1048GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java
1049$(GEN): $(HIDL)
1050$(GEN): PRIVATE_HIDL := $(HIDL)
1051$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1052$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1053$(GEN): PRIVATE_CUSTOM_TOOL = \
1054 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1055 -Ljava \
1056 -randroid.hardware:hardware/interfaces \
1057 -randroid.hidl:system/libhidl/transport \
1058 android.hardware.automotive.vehicle@2.0::types.VehicleTurnSignal
1059
1060$(GEN): $(LOCAL_PATH)/types.hal
1061 $(transform-generated-source)
1062LOCAL_GENERATED_SOURCES += $(GEN)
1063
1064#
1065# Build types.hal (VehicleUnit)
1066#
1067GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.java
1068$(GEN): $(HIDL)
1069$(GEN): PRIVATE_HIDL := $(HIDL)
1070$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1071$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1072$(GEN): PRIVATE_CUSTOM_TOOL = \
1073 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1074 -Ljava \
1075 -randroid.hardware:hardware/interfaces \
1076 -randroid.hidl:system/libhidl/transport \
1077 android.hardware.automotive.vehicle@2.0::types.VehicleUnit
1078
1079$(GEN): $(LOCAL_PATH)/types.hal
1080 $(transform-generated-source)
1081LOCAL_GENERATED_SOURCES += $(GEN)
1082
1083#
1084# Build types.hal (VmsAvailabilityStateIntegerValuesIndex)
1085#
1086GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java
1087$(GEN): $(HIDL)
1088$(GEN): PRIVATE_HIDL := $(HIDL)
1089$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1090$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1091$(GEN): PRIVATE_CUSTOM_TOOL = \
1092 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1093 -Ljava \
1094 -randroid.hardware:hardware/interfaces \
1095 -randroid.hidl:system/libhidl/transport \
1096 android.hardware.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex
1097
1098$(GEN): $(LOCAL_PATH)/types.hal
1099 $(transform-generated-source)
1100LOCAL_GENERATED_SOURCES += $(GEN)
1101
1102#
1103# Build types.hal (VmsBaseMessageIntegerValuesIndex)
1104#
1105GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java
1106$(GEN): $(HIDL)
1107$(GEN): PRIVATE_HIDL := $(HIDL)
1108$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1109$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1110$(GEN): PRIVATE_CUSTOM_TOOL = \
1111 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1112 -Ljava \
1113 -randroid.hardware:hardware/interfaces \
1114 -randroid.hidl:system/libhidl/transport \
1115 android.hardware.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex
1116
1117$(GEN): $(LOCAL_PATH)/types.hal
1118 $(transform-generated-source)
1119LOCAL_GENERATED_SOURCES += $(GEN)
1120
1121#
1122# Build types.hal (VmsMessageType)
1123#
1124GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
1125$(GEN): $(HIDL)
1126$(GEN): PRIVATE_HIDL := $(HIDL)
1127$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1128$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1129$(GEN): PRIVATE_CUSTOM_TOOL = \
1130 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1131 -Ljava \
1132 -randroid.hardware:hardware/interfaces \
1133 -randroid.hidl:system/libhidl/transport \
1134 android.hardware.automotive.vehicle@2.0::types.VmsMessageType
1135
1136$(GEN): $(LOCAL_PATH)/types.hal
1137 $(transform-generated-source)
1138LOCAL_GENERATED_SOURCES += $(GEN)
1139
1140#
1141# Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex)
1142#
1143GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java
1144$(GEN): $(HIDL)
1145$(GEN): PRIVATE_HIDL := $(HIDL)
1146$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1147$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1148$(GEN): PRIVATE_CUSTOM_TOOL = \
1149 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1150 -Ljava \
1151 -randroid.hardware:hardware/interfaces \
1152 -randroid.hidl:system/libhidl/transport \
1153 android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex
1154
1155$(GEN): $(LOCAL_PATH)/types.hal
1156 $(transform-generated-source)
1157LOCAL_GENERATED_SOURCES += $(GEN)
1158
1159#
1160# Build types.hal (VmsMessageWithLayerIntegerValuesIndex)
1161#
1162GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java
1163$(GEN): $(HIDL)
1164$(GEN): PRIVATE_HIDL := $(HIDL)
1165$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1166$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1167$(GEN): PRIVATE_CUSTOM_TOOL = \
1168 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1169 -Ljava \
1170 -randroid.hardware:hardware/interfaces \
1171 -randroid.hidl:system/libhidl/transport \
1172 android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex
1173
1174$(GEN): $(LOCAL_PATH)/types.hal
1175 $(transform-generated-source)
1176LOCAL_GENERATED_SOURCES += $(GEN)
1177
1178#
1179# Build types.hal (VmsOfferingMessageIntegerValuesIndex)
1180#
1181GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java
1182$(GEN): $(HIDL)
1183$(GEN): PRIVATE_HIDL := $(HIDL)
1184$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1185$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1186$(GEN): PRIVATE_CUSTOM_TOOL = \
1187 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1188 -Ljava \
1189 -randroid.hardware:hardware/interfaces \
1190 -randroid.hidl:system/libhidl/transport \
1191 android.hardware.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex
1192
1193$(GEN): $(LOCAL_PATH)/types.hal
1194 $(transform-generated-source)
1195LOCAL_GENERATED_SOURCES += $(GEN)
1196
1197#
1198# Build types.hal (VmsSubscriptionsStateIntegerValuesIndex)
1199#
1200GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java
1201$(GEN): $(HIDL)
1202$(GEN): PRIVATE_HIDL := $(HIDL)
1203$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1204$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1205$(GEN): PRIVATE_CUSTOM_TOOL = \
1206 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1207 -Ljava \
1208 -randroid.hardware:hardware/interfaces \
1209 -randroid.hidl:system/libhidl/transport \
1210 android.hardware.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex
1211
1212$(GEN): $(LOCAL_PATH)/types.hal
1213 $(transform-generated-source)
1214LOCAL_GENERATED_SOURCES += $(GEN)
1215
1216#
1217# Build types.hal (Wheel)
1218#
1219GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.java
1220$(GEN): $(HIDL)
1221$(GEN): PRIVATE_HIDL := $(HIDL)
1222$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1223$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1224$(GEN): PRIVATE_CUSTOM_TOOL = \
1225 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1226 -Ljava \
1227 -randroid.hardware:hardware/interfaces \
1228 -randroid.hidl:system/libhidl/transport \
1229 android.hardware.automotive.vehicle@2.0::types.Wheel
1230
1231$(GEN): $(LOCAL_PATH)/types.hal
1232 $(transform-generated-source)
1233LOCAL_GENERATED_SOURCES += $(GEN)
1234
1235#
1236# Build IVehicle.hal
1237#
1238GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java
1239$(GEN): $(HIDL)
1240$(GEN): PRIVATE_HIDL := $(HIDL)
1241$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
1242$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IVehicleCallback.hal
1243$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
1244$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
1245$(GEN): $(LOCAL_PATH)/types.hal
1246$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1247$(GEN): PRIVATE_CUSTOM_TOOL = \
1248 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1249 -Ljava \
1250 -randroid.hardware:hardware/interfaces \
1251 -randroid.hidl:system/libhidl/transport \
1252 android.hardware.automotive.vehicle@2.0::IVehicle
1253
1254$(GEN): $(LOCAL_PATH)/IVehicle.hal
1255 $(transform-generated-source)
1256LOCAL_GENERATED_SOURCES += $(GEN)
1257
1258#
1259# Build IVehicleCallback.hal
1260#
1261GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java
1262$(GEN): $(HIDL)
1263$(GEN): PRIVATE_HIDL := $(HIDL)
1264$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.hal
1265$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
1266$(GEN): $(LOCAL_PATH)/types.hal
1267$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1268$(GEN): PRIVATE_CUSTOM_TOOL = \
1269 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1270 -Ljava \
1271 -randroid.hardware:hardware/interfaces \
1272 -randroid.hidl:system/libhidl/transport \
1273 android.hardware.automotive.vehicle@2.0::IVehicleCallback
1274
1275$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
1276 $(transform-generated-source)
1277LOCAL_GENERATED_SOURCES += $(GEN)
1278include $(BUILD_JAVA_LIBRARY)
1279
1280
1281################################################################################
1282
1283include $(CLEAR_VARS)
1284LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java-static 8LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java-static
1285LOCAL_MODULE_CLASS := JAVA_LIBRARIES 9LOCAL_MODULE_CLASS := JAVA_LIBRARIES
1286 10
diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp
index 9f8e7ec5..1d59105e 100644
--- a/broadcastradio/1.1/Android.bp
+++ b/broadcastradio/1.1/Android.bp
@@ -18,10 +18,16 @@ hidl_interface {
18 "android.hidl.base@1.0", 18 "android.hidl.base@1.0",
19 ], 19 ],
20 types: [ 20 types: [
21 "IdentifierType",
22 "Modulation",
23 "ProgramIdentifier",
21 "ProgramInfo", 24 "ProgramInfo",
22 "ProgramInfoFlags", 25 "ProgramInfoFlags",
23 "ProgramListResult", 26 "ProgramListResult",
27 "ProgramSelector",
28 "ProgramType",
24 "Properties", 29 "Properties",
30 "VendorKeyValue",
25 ], 31 ],
26 gen_java: false, 32 gen_java: false,
27} 33}
diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp
index 2a199916..f006f798 100644
--- a/camera/device/3.3/Android.bp
+++ b/camera/device/3.3/Android.bp
@@ -1,72 +1,25 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.camera.device@3.3_hal",
5 srcs: [
6 "types.hal",
7 "ICameraDeviceSession.hal",
8 ],
9}
10
11genrule {
12 name: "android.hardware.camera.device@3.3_genc++",
13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
15 srcs: [
16 ":android.hardware.camera.device@3.3_hal",
17 ],
18 out: [
19 "android/hardware/camera/device/3.3/types.cpp",
20 "android/hardware/camera/device/3.3/CameraDeviceSessionAll.cpp",
21 ],
22}
23
24genrule {
25 name: "android.hardware.camera.device@3.3_genc++_headers",
26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
28 srcs: [
29 ":android.hardware.camera.device@3.3_hal",
30 ],
31 out: [
32 "android/hardware/camera/device/3.3/types.h",
33 "android/hardware/camera/device/3.3/hwtypes.h",
34 "android/hardware/camera/device/3.3/ICameraDeviceSession.h",
35 "android/hardware/camera/device/3.3/IHwCameraDeviceSession.h",
36 "android/hardware/camera/device/3.3/BnHwCameraDeviceSession.h",
37 "android/hardware/camera/device/3.3/BpHwCameraDeviceSession.h",
38 "android/hardware/camera/device/3.3/BsCameraDeviceSession.h",
39 ],
40}
41
42cc_library {
43 name: "android.hardware.camera.device@3.3", 4 name: "android.hardware.camera.device@3.3",
44 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
45 generated_sources: ["android.hardware.camera.device@3.3_genc++"],
46 generated_headers: ["android.hardware.camera.device@3.3_genc++_headers"],
47 export_generated_headers: ["android.hardware.camera.device@3.3_genc++_headers"],
48 vendor_available: true,
49 vndk: { 6 vndk: {
50 enabled: true, 7 enabled: true,
51 }, 8 },
52 shared_libs: [ 9 srcs: [
53 "libhidlbase", 10 "types.hal",
54 "libhidltransport", 11 "ICameraDeviceSession.hal",
55 "libhwbinder",
56 "liblog",
57 "libutils",
58 "libcutils",
59 "android.hardware.camera.common@1.0",
60 "android.hardware.camera.device@3.2",
61 "android.hardware.graphics.common@1.0",
62 ], 12 ],
63 export_shared_lib_headers: [ 13 interfaces: [
64 "libhidlbase",
65 "libhidltransport",
66 "libhwbinder",
67 "libutils",
68 "android.hardware.camera.common@1.0", 14 "android.hardware.camera.common@1.0",
69 "android.hardware.camera.device@3.2", 15 "android.hardware.camera.device@3.2",
70 "android.hardware.graphics.common@1.0", 16 "android.hardware.graphics.common@1.0",
17 "android.hidl.base@1.0",
18 ],
19 types: [
20 "HalStream",
21 "HalStreamConfiguration",
71 ], 22 ],
23 gen_java: false,
72} 24}
25
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 7139ad05..63d7fd5d 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -14,7 +14,6 @@ hidl_interface {
14 "android.hardware.camera.common@1.0", 14 "android.hardware.camera.common@1.0",
15 "android.hardware.camera.device@1.0", 15 "android.hardware.camera.device@1.0",
16 "android.hardware.camera.device@3.2", 16 "android.hardware.camera.device@3.2",
17 "android.hardware.graphics.common@1.0",
18 "android.hidl.base@1.0", 17 "android.hidl.base@1.0",
19 ], 18 ],
20 gen_java: false, 19 gen_java: false,
diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp
index 6d94793b..39b36beb 100644
--- a/cas/1.0/Android.bp
+++ b/cas/1.0/Android.bp
@@ -1,7 +1,11 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.cas@1.0_hal", 4 name: "android.hardware.cas@1.0",
5 root: "android.hardware",
6 vndk: {
7 enabled: true,
8 },
5 srcs: [ 9 srcs: [
6 "types.hal", 10 "types.hal",
7 "ICas.hal", 11 "ICas.hal",
@@ -9,79 +13,13 @@ filegroup {
9 "IDescramblerBase.hal", 13 "IDescramblerBase.hal",
10 "IMediaCasService.hal", 14 "IMediaCasService.hal",
11 ], 15 ],
12} 16 interfaces: [
13 17 "android.hidl.base@1.0",
14genrule {
15 name: "android.hardware.cas@1.0_genc++",
16 tools: ["hidl-gen"],
17 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",
18 srcs: [
19 ":android.hardware.cas@1.0_hal",
20 ], 18 ],
21 out: [ 19 types: [
22 "android/hardware/cas/1.0/types.cpp", 20 "HidlCasPluginDescriptor",
23 "android/hardware/cas/1.0/CasAll.cpp", 21 "Status",
24 "android/hardware/cas/1.0/CasListenerAll.cpp",
25 "android/hardware/cas/1.0/DescramblerBaseAll.cpp",
26 "android/hardware/cas/1.0/MediaCasServiceAll.cpp",
27 ], 22 ],
23 gen_java: true,
28} 24}
29 25
30genrule {
31 name: "android.hardware.cas@1.0_genc++_headers",
32 tools: ["hidl-gen"],
33 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",
34 srcs: [
35 ":android.hardware.cas@1.0_hal",
36 ],
37 out: [
38 "android/hardware/cas/1.0/types.h",
39 "android/hardware/cas/1.0/hwtypes.h",
40 "android/hardware/cas/1.0/ICas.h",
41 "android/hardware/cas/1.0/IHwCas.h",
42 "android/hardware/cas/1.0/BnHwCas.h",
43 "android/hardware/cas/1.0/BpHwCas.h",
44 "android/hardware/cas/1.0/BsCas.h",
45 "android/hardware/cas/1.0/ICasListener.h",
46 "android/hardware/cas/1.0/IHwCasListener.h",
47 "android/hardware/cas/1.0/BnHwCasListener.h",
48 "android/hardware/cas/1.0/BpHwCasListener.h",
49 "android/hardware/cas/1.0/BsCasListener.h",
50 "android/hardware/cas/1.0/IDescramblerBase.h",
51 "android/hardware/cas/1.0/IHwDescramblerBase.h",
52 "android/hardware/cas/1.0/BnHwDescramblerBase.h",
53 "android/hardware/cas/1.0/BpHwDescramblerBase.h",
54 "android/hardware/cas/1.0/BsDescramblerBase.h",
55 "android/hardware/cas/1.0/IMediaCasService.h",
56 "android/hardware/cas/1.0/IHwMediaCasService.h",
57 "android/hardware/cas/1.0/BnHwMediaCasService.h",
58 "android/hardware/cas/1.0/BpHwMediaCasService.h",
59 "android/hardware/cas/1.0/BsMediaCasService.h",
60 ],
61}
62
63cc_library {
64 name: "android.hardware.cas@1.0",
65 defaults: ["hidl-module-defaults"],
66 generated_sources: ["android.hardware.cas@1.0_genc++"],
67 generated_headers: ["android.hardware.cas@1.0_genc++_headers"],
68 export_generated_headers: ["android.hardware.cas@1.0_genc++_headers"],
69 vendor_available: true,
70 vndk: {
71 enabled: true,
72 },
73 shared_libs: [
74 "libhidlbase",
75 "libhidltransport",
76 "libhwbinder",
77 "liblog",
78 "libutils",
79 "libcutils",
80 ],
81 export_shared_lib_headers: [
82 "libhidlbase",
83 "libhidltransport",
84 "libhwbinder",
85 "libutils",
86 ],
87}
diff --git a/cas/1.0/default/DescramblerImpl.cpp b/cas/1.0/default/DescramblerImpl.cpp
index 3d90809c..36699baf 100644
--- a/cas/1.0/default/DescramblerImpl.cpp
+++ b/cas/1.0/default/DescramblerImpl.cpp
@@ -18,8 +18,9 @@
18#define LOG_TAG "android.hardware.cas@1.0-DescramblerImpl" 18#define LOG_TAG "android.hardware.cas@1.0-DescramblerImpl"
19 19
20#include <hidlmemory/mapping.h> 20#include <hidlmemory/mapping.h>
21#include <media/hardware/CryptoAPI.h>
22#include <media/cas/DescramblerAPI.h> 21#include <media/cas/DescramblerAPI.h>
22#include <media/hardware/CryptoAPI.h>
23#include <media/stagefright/foundation/AUtils.h>
23#include <utils/Log.h> 24#include <utils/Log.h>
24 25
25#include "DescramblerImpl.h" 26#include "DescramblerImpl.h"
@@ -70,6 +71,11 @@ Return<bool> DescramblerImpl::requiresSecureDecoderComponent(
70 return mPlugin->requiresSecureDecoderComponent(String8(mime.c_str())); 71 return mPlugin->requiresSecureDecoderComponent(String8(mime.c_str()));
71} 72}
72 73
74static inline bool validateRangeForSize(
75 uint64_t offset, uint64_t length, uint64_t size) {
76 return isInRange<uint64_t, uint64_t>(0, size, offset, length);
77}
78
73Return<void> DescramblerImpl::descramble( 79Return<void> DescramblerImpl::descramble(
74 ScramblingControl scramblingControl, 80 ScramblingControl scramblingControl,
75 const hidl_vec<SubSample>& subSamples, 81 const hidl_vec<SubSample>& subSamples,
@@ -81,12 +87,57 @@ Return<void> DescramblerImpl::descramble(
81 ALOGV("%s", __FUNCTION__); 87 ALOGV("%s", __FUNCTION__);
82 88
83 sp<IMemory> srcMem = mapMemory(srcBuffer.heapBase); 89 sp<IMemory> srcMem = mapMemory(srcBuffer.heapBase);
90
91 // Validate if the offset and size in the SharedBuffer is consistent with the
92 // mapped ashmem, since the offset and size is controlled by client.
93 if (srcMem == NULL) {
94 ALOGE("Failed to map src buffer.");
95 _hidl_cb(toStatus(BAD_VALUE), 0, NULL);
96 return Void();
97 }
98 if (!validateRangeForSize(
99 srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize())) {
100 ALOGE("Invalid src buffer range: offset %llu, size %llu, srcMem size %llu",
101 srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize());
102 android_errorWriteLog(0x534e4554, "67962232");
103 _hidl_cb(toStatus(BAD_VALUE), 0, NULL);
104 return Void();
105 }
106
107 // use 64-bit here to catch bad subsample size that might be overflowing.
108 uint64_t totalBytesInSubSamples = 0;
109 for (size_t i = 0; i < subSamples.size(); i++) {
110 totalBytesInSubSamples += (uint64_t)subSamples[i].numBytesOfClearData +
111 subSamples[i].numBytesOfEncryptedData;
112 }
113 // Further validate if the specified srcOffset and requested total subsample size
114 // is consistent with the source shared buffer size.
115 if (!validateRangeForSize(srcOffset, totalBytesInSubSamples, srcBuffer.size)) {
116 ALOGE("Invalid srcOffset and subsample size: "
117 "srcOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",
118 srcOffset, totalBytesInSubSamples, srcBuffer.size);
119 android_errorWriteLog(0x534e4554, "67962232");
120 _hidl_cb(toStatus(BAD_VALUE), 0, NULL);
121 return Void();
122 }
123
84 void *srcPtr = (uint8_t *)(void *)srcMem->getPointer() + srcBuffer.offset; 124 void *srcPtr = (uint8_t *)(void *)srcMem->getPointer() + srcBuffer.offset;
85 void *dstPtr = NULL; 125 void *dstPtr = NULL;
86 if (dstBuffer.type == BufferType::SHARED_MEMORY) { 126 if (dstBuffer.type == BufferType::SHARED_MEMORY) {
87 // When using shared memory, src buffer is also used as dst, 127 // When using shared memory, src buffer is also used as dst,
88 // we don't map it again here. 128 // we don't map it again here.
89 dstPtr = srcPtr; 129 dstPtr = srcPtr;
130
131 // In this case the dst and src would be the same buffer, need to validate
132 // dstOffset against the buffer size too.
133 if (!validateRangeForSize(dstOffset, totalBytesInSubSamples, srcBuffer.size)) {
134 ALOGE("Invalid dstOffset and subsample size: "
135 "dstOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",
136 dstOffset, totalBytesInSubSamples, srcBuffer.size);
137 android_errorWriteLog(0x534e4554, "67962232");
138 _hidl_cb(toStatus(BAD_VALUE), 0, NULL);
139 return Void();
140 }
90 } else { 141 } else {
91 native_handle_t *handle = const_cast<native_handle_t *>( 142 native_handle_t *handle = const_cast<native_handle_t *>(
92 dstBuffer.secureMemory.getNativeHandle()); 143 dstBuffer.secureMemory.getNativeHandle());
diff --git a/cas/native/1.0/Android.bp b/cas/native/1.0/Android.bp
index e39cab1f..75874161 100644
--- a/cas/native/1.0/Android.bp
+++ b/cas/native/1.0/Android.bp
@@ -1,68 +1,26 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.cas.native@1.0_hal",
5 srcs: [
6 "types.hal",
7 "IDescrambler.hal",
8 ],
9}
10
11genrule {
12 name: "android.hardware.cas.native@1.0_genc++",
13 tools: ["hidl-gen"],
14 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0",
15 srcs: [
16 ":android.hardware.cas.native@1.0_hal",
17 ],
18 out: [
19 "android/hardware/cas/native/1.0/types.cpp",
20 "android/hardware/cas/native/1.0/DescramblerAll.cpp",
21 ],
22}
23
24genrule {
25 name: "android.hardware.cas.native@1.0_genc++_headers",
26 tools: ["hidl-gen"],
27 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0",
28 srcs: [
29 ":android.hardware.cas.native@1.0_hal",
30 ],
31 out: [
32 "android/hardware/cas/native/1.0/types.h",
33 "android/hardware/cas/native/1.0/hwtypes.h",
34 "android/hardware/cas/native/1.0/IDescrambler.h",
35 "android/hardware/cas/native/1.0/IHwDescrambler.h",
36 "android/hardware/cas/native/1.0/BnHwDescrambler.h",
37 "android/hardware/cas/native/1.0/BpHwDescrambler.h",
38 "android/hardware/cas/native/1.0/BsDescrambler.h",
39 ],
40}
41
42cc_library {
43 name: "android.hardware.cas.native@1.0", 4 name: "android.hardware.cas.native@1.0",
44 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
45 generated_sources: ["android.hardware.cas.native@1.0_genc++"],
46 generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"],
47 export_generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"],
48 vendor_available: true,
49 vndk: { 6 vndk: {
50 enabled: true, 7 enabled: true,
51 }, 8 },
52 shared_libs: [ 9 srcs: [
53 "libhidlbase", 10 "types.hal",
54 "libhidltransport", 11 "IDescrambler.hal",
55 "libhwbinder",
56 "liblog",
57 "libutils",
58 "libcutils",
59 "android.hardware.cas@1.0",
60 ], 12 ],
61 export_shared_lib_headers: [ 13 interfaces: [
62 "libhidlbase",
63 "libhidltransport",
64 "libhwbinder",
65 "libutils",
66 "android.hardware.cas@1.0", 14 "android.hardware.cas@1.0",
15 "android.hidl.base@1.0",
67 ], 16 ],
17 types: [
18 "BufferType",
19 "DestinationBuffer",
20 "ScramblingControl",
21 "SharedBuffer",
22 "SubSample",
23 ],
24 gen_java: false,
68} 25}
26
diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk
index 8b24031f..240b2a26 100644
--- a/configstore/1.0/default/Android.mk
+++ b/configstore/1.0/default/Android.mk
@@ -13,13 +13,13 @@ LOCAL_SRC_FILES:= service.cpp
13include $(LOCAL_PATH)/surfaceflinger.mk 13include $(LOCAL_PATH)/surfaceflinger.mk
14 14
15LOCAL_SHARED_LIBRARIES := \ 15LOCAL_SHARED_LIBRARIES := \
16 android.hardware.configstore@1.0 \
17 libhidlbase \ 16 libhidlbase \
18 libhidltransport \ 17 libhidltransport \
19 libbase \ 18 libbase \
20 libhwminijail \ 19 libhwminijail \
21 liblog \ 20 liblog \
22 libutils \ 21 libutils \
22 android.hardware.configstore@1.0 \
23 23
24include $(BUILD_EXECUTABLE) 24include $(BUILD_EXECUTABLE)
25 25
diff --git a/current.txt b/current.txt
index db34c37b..c81e01b4 100644
--- a/current.txt
+++ b/current.txt
@@ -193,8 +193,11 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar
193150a338ce11fcec70757c9675d83cf6a5d7b40d0c812741b91671fecce59eac9 android.hardware.broadcastradio@1.0::types 193150a338ce11fcec70757c9675d83cf6a5d7b40d0c812741b91671fecce59eac9 android.hardware.broadcastradio@1.0::types
194dc7e6d4f537b9943e27edc4f86c5a03bb643b18f18f866f8c3c71c0ac4ea8cbc android.hardware.broadcastradio@1.0::types 194dc7e6d4f537b9943e27edc4f86c5a03bb643b18f18f866f8c3c71c0ac4ea8cbc android.hardware.broadcastradio@1.0::types
195760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice 195760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice
19678589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860
196e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse 197e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse
1976e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse 1986e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse
199c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O
2004922dd58e89a03181ed1c48a6e118e47633b73b11090bdfed5aa920d25a7592b android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O DR
19828e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types 20128e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
199df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types 202df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types
200 203
diff --git a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
index 4652c76d..a110eb15 100644
--- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
@@ -89,6 +89,10 @@ static const uint8_t kInvalidUUID[16] = {
89 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 89 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80,
90 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80}; 90 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80};
91 91
92static const uint32_t k256SubSampleByteCount = 256;
93static const uint32_t k512SubSampleClearBytes = 512;
94static const uint32_t k512SubSampleEncryptedBytes = 512;
95
92class DrmHalClearkeyFactoryTest : public ::testing::VtsHalHidlTargetTestBase { 96class DrmHalClearkeyFactoryTest : public ::testing::VtsHalHidlTargetTestBase {
93 public: 97 public:
94 virtual void SetUp() override { 98 virtual void SetUp() override {
@@ -965,6 +969,8 @@ class DrmHalClearkeyDecryptTest : public DrmHalClearkeyPluginTest {
965 const hidl_vec<SubSample>& subSamples, const vector<uint8_t>& key); 969 const hidl_vec<SubSample>& subSamples, const vector<uint8_t>& key);
966 void aes_cbc_decrypt(uint8_t* dest, uint8_t* src, uint8_t* iv, 970 void aes_cbc_decrypt(uint8_t* dest, uint8_t* src, uint8_t* iv,
967 const hidl_vec<SubSample>& subSamples, const vector<uint8_t>& key); 971 const hidl_vec<SubSample>& subSamples, const vector<uint8_t>& key);
972 void decryptWithInvalidKeys(hidl_vec<uint8_t>& invalidResponse,
973 vector<uint8_t>& iv, const Pattern& noPattern, const vector<SubSample>& subSamples);
968}; 974};
969 975
970void DrmHalClearkeyDecryptTest::fillRandom(const sp<IMemory>& memory) { 976void DrmHalClearkeyDecryptTest::fillRandom(const sp<IMemory>& memory) {
@@ -1119,16 +1125,14 @@ TEST_F(DrmHalClearkeyDecryptTest, TestQueryKeyStatus) {
1119 closeSession(sessionId); 1125 closeSession(sessionId);
1120} 1126}
1121 1127
1122
1123/** 1128/**
1124 * Positive decrypt test. "Decrypt" a single clear segment 1129 * Positive decrypt test. "Decrypt" a single clear segment
1125 */ 1130 */
1126TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) { 1131TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) {
1127 vector<uint8_t> iv(AES_BLOCK_SIZE, 0); 1132 vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
1128 const Pattern noPattern = {0, 0}; 1133 const Pattern noPattern = {0, 0};
1129 const uint32_t kByteCount = 256;
1130 const vector<SubSample> subSamples = { 1134 const vector<SubSample> subSamples = {
1131 {.numBytesOfClearData = kByteCount, 1135 {.numBytesOfClearData = k256SubSampleByteCount,
1132 .numBytesOfEncryptedData = 0}}; 1136 .numBytesOfEncryptedData = 0}};
1133 auto sessionId = openSession(); 1137 auto sessionId = openSession();
1134 loadKeys(sessionId); 1138 loadKeys(sessionId);
@@ -1138,7 +1142,7 @@ TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) {
1138 1142
1139 uint32_t byteCount = decrypt(Mode::UNENCRYPTED, &iv[0], subSamples, 1143 uint32_t byteCount = decrypt(Mode::UNENCRYPTED, &iv[0], subSamples,
1140 noPattern, Status::OK); 1144 noPattern, Status::OK);
1141 EXPECT_EQ(kByteCount, byteCount); 1145 EXPECT_EQ(k256SubSampleByteCount, byteCount);
1142 1146
1143 closeSession(sessionId); 1147 closeSession(sessionId);
1144} 1148}
@@ -1150,12 +1154,9 @@ TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) {
1150TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) { 1154TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) {
1151 vector<uint8_t> iv(AES_BLOCK_SIZE, 0); 1155 vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
1152 const Pattern noPattern = {0, 0}; 1156 const Pattern noPattern = {0, 0};
1153 const uint32_t kClearBytes = 512;
1154 const uint32_t kEncryptedBytes = 512;
1155 const vector<SubSample> subSamples = { 1157 const vector<SubSample> subSamples = {
1156 {.numBytesOfClearData = kClearBytes, 1158 {.numBytesOfClearData = k512SubSampleClearBytes,
1157 .numBytesOfEncryptedData = kEncryptedBytes 1159 .numBytesOfEncryptedData = k512SubSampleEncryptedBytes}};
1158 }};
1159 auto sessionId = openSession(); 1160 auto sessionId = openSession();
1160 loadKeys(sessionId); 1161 loadKeys(sessionId);
1161 1162
@@ -1164,10 +1165,11 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) {
1164 1165
1165 uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples, 1166 uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,
1166 noPattern, Status::OK); 1167 noPattern, Status::OK);
1167 EXPECT_EQ(kClearBytes + kEncryptedBytes, byteCount); 1168 EXPECT_EQ(k512SubSampleClearBytes + k512SubSampleEncryptedBytes, byteCount);
1168 1169
1169 closeSession(sessionId); 1170 closeSession(sessionId);
1170} 1171}
1172
1171/** 1173/**
1172 * Negative decrypt test. Decrypt without loading keys. 1174 * Negative decrypt test. Decrypt without loading keys.
1173 */ 1175 */
@@ -1175,8 +1177,8 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTestNoKeys) {
1175 vector<uint8_t> iv(AES_BLOCK_SIZE, 0); 1177 vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
1176 const Pattern noPattern = {0, 0}; 1178 const Pattern noPattern = {0, 0};
1177 const vector<SubSample> subSamples = { 1179 const vector<SubSample> subSamples = {
1178 {.numBytesOfClearData = 256, 1180 {.numBytesOfClearData = k256SubSampleByteCount,
1179 .numBytesOfEncryptedData = 256}}; 1181 .numBytesOfEncryptedData = k256SubSampleByteCount}};
1180 auto sessionId = openSession(); 1182 auto sessionId = openSession();
1181 1183
1182 Status status = cryptoPlugin->setMediaDrmSession(sessionId); 1184 Status status = cryptoPlugin->setMediaDrmSession(sessionId);
@@ -1188,3 +1190,94 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTestNoKeys) {
1188 1190
1189 closeSession(sessionId); 1191 closeSession(sessionId);
1190} 1192}
1193
1194/**
1195 * Helper method to test decryption with invalid keys is returned
1196 */
1197void DrmHalClearkeyDecryptTest::decryptWithInvalidKeys(
1198 hidl_vec<uint8_t>& invalidResponse,
1199 vector<uint8_t>& iv,
1200 const Pattern& noPattern,
1201 const vector<SubSample>& subSamples) {
1202 auto sessionId = openSession();
1203
1204 auto res = drmPlugin->provideKeyResponse(
1205 sessionId, invalidResponse,
1206 [&](Status status, const hidl_vec<uint8_t>& myKeySetId) {
1207 EXPECT_EQ(Status::OK, status);
1208 EXPECT_EQ(0u, myKeySetId.size());
1209 });
1210 ASSERT_OK(res);
1211
1212 ASSERT_TRUE(cryptoPlugin->setMediaDrmSession(sessionId).isOk());
1213
1214 uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,
1215 noPattern, Status::ERROR_DRM_NO_LICENSE);
1216 EXPECT_EQ(0u, byteCount);
1217
1218 closeSession(sessionId);
1219}
1220
1221/**
1222 * Negative decrypt test. Decrypt with invalid key.
1223 */
1224TEST_F(DrmHalClearkeyDecryptTest, DecryptWithEmptyKey) {
1225 vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
1226 const Pattern noPattern = {0, 0};
1227 const vector<SubSample> subSamples = {
1228 {.numBytesOfClearData = k512SubSampleClearBytes,
1229 .numBytesOfEncryptedData = k512SubSampleEncryptedBytes}};
1230
1231 // base 64 encoded JSON response string, must not contain padding character '='
1232 const hidl_string emptyKeyResponse =
1233 "{\"keys\":[" \
1234 "{" \
1235 "\"kty\":\"oct\"" \
1236 "\"alg\":\"A128KW2\"" \
1237 "\"k\":\"SGVsbG8gRnJpZW5kIQ\"" \
1238 "\"kid\":\"Y2xlYXJrZXlrZXlpZDAyAy\"" \
1239 "}" \
1240 "{" \
1241 "\"kty\":\"oct\"," \
1242 "\"alg\":\"A128KW2\"" \
1243 "\"kid\":\"Y2xlYXJrZXlrZXlpZDAzAy\"," \
1244 // empty key follows
1245 "\"k\":\"R\"" \
1246 "}]" \
1247 "}";
1248 const size_t kEmptyKeyResponseSize = emptyKeyResponse.size();
1249
1250 hidl_vec<uint8_t> invalidResponse;
1251 invalidResponse.resize(kEmptyKeyResponseSize);
1252 memcpy(invalidResponse.data(), emptyKeyResponse.c_str(), kEmptyKeyResponseSize);
1253 decryptWithInvalidKeys(invalidResponse, iv, noPattern, subSamples);
1254}
1255
1256/**
1257 * Negative decrypt test. Decrypt with a key exceeds AES_BLOCK_SIZE.
1258 */
1259TEST_F(DrmHalClearkeyDecryptTest, DecryptWithKeyTooLong) {
1260 vector<uint8_t> iv(AES_BLOCK_SIZE, 0);
1261 const Pattern noPattern = {0, 0};
1262 const vector<SubSample> subSamples = {
1263 {.numBytesOfClearData = k512SubSampleClearBytes,
1264 .numBytesOfEncryptedData = k512SubSampleEncryptedBytes}};
1265
1266 // base 64 encoded JSON response string, must not contain padding character '='
1267 const hidl_string keyTooLongResponse =
1268 "{\"keys\":[" \
1269 "{" \
1270 "\"kty\":\"oct\"," \
1271 "\"alg\":\"A128KW2\"" \
1272 "\"kid\":\"Y2xlYXJrZXlrZXlpZDAzAy\"," \
1273 // key too long
1274 "\"k\":\"V2lubmllIHRoZSBwb29oIVdpbm5pZSB0aGUgcG9vaCE=\"" \
1275 "}]" \
1276 "}";
1277 const size_t kKeyTooLongResponseSize = keyTooLongResponse.size();
1278
1279 hidl_vec<uint8_t> invalidResponse;
1280 invalidResponse.resize(kKeyTooLongResponseSize);
1281 memcpy(invalidResponse.data(), keyTooLongResponse.c_str(), kKeyTooLongResponseSize);
1282 decryptWithInvalidKeys(invalidResponse, iv, noPattern, subSamples);
1283}
diff --git a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
index 91e75fe1..b3ab5944 100644
--- a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
+++ b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
@@ -147,7 +147,8 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
147 EXPECT_EQ(location_called_count_, 1); 147 EXPECT_EQ(location_called_count_, 1);
148 } 148 }
149 if (location_called_count_ > 0) { 149 if (location_called_count_ > 0) {
150 CheckLocation(last_location_, checkAccuracies); 150 // don't require speed on first fix
151 CheckLocation(last_location_, checkAccuracies, false);
151 return true; 152 return true;
152 } 153 }
153 return false; 154 return false;
@@ -176,20 +177,24 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
176 177
177 /* 178 /*
178 * CheckLocation: 179 * CheckLocation:
179 * Helper function to vet Location fields 180 * Helper function to vet Location fields
180 */ 181 */
181 void CheckLocation(GnssLocation& location, bool checkAccuracies) { 182 void CheckLocation(GnssLocation& location, bool checkAccuracies, bool checkSpeed) {
182 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_LAT_LONG); 183 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_LAT_LONG);
183 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_ALTITUDE); 184 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_ALTITUDE);
184 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED); 185 if (checkSpeed) {
186 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED);
187 }
185 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_HORIZONTAL_ACCURACY); 188 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_HORIZONTAL_ACCURACY);
186 // New uncertainties available in O must be provided, 189 // New uncertainties available in O must be provided,
187 // at least when paired with modern hardware (2017+) 190 // at least when paired with modern hardware (2017+)
188 if (checkAccuracies) { 191 if (checkAccuracies) {
189 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_VERTICAL_ACCURACY); 192 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_VERTICAL_ACCURACY);
190 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED_ACCURACY); 193 if (checkSpeed) {
191 if (location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING) { 194 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED_ACCURACY);
192 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING_ACCURACY); 195 if (location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING) {
196 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING_ACCURACY);
197 }
193 } 198 }
194 } 199 }
195 EXPECT_GE(location.latitudeDegrees, -90.0); 200 EXPECT_GE(location.latitudeDegrees, -90.0);
@@ -198,12 +203,14 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
198 EXPECT_LE(location.longitudeDegrees, 180.0); 203 EXPECT_LE(location.longitudeDegrees, 180.0);
199 EXPECT_GE(location.altitudeMeters, -1000.0); 204 EXPECT_GE(location.altitudeMeters, -1000.0);
200 EXPECT_LE(location.altitudeMeters, 30000.0); 205 EXPECT_LE(location.altitudeMeters, 30000.0);
201 EXPECT_GE(location.speedMetersPerSec, 0.0); 206 if (checkSpeed) {
202 EXPECT_LE(location.speedMetersPerSec, 5.0); // VTS tests are stationary. 207 EXPECT_GE(location.speedMetersPerSec, 0.0);
208 EXPECT_LE(location.speedMetersPerSec, 5.0); // VTS tests are stationary.
203 209
204 // Non-zero speeds must be reported with an associated bearing 210 // Non-zero speeds must be reported with an associated bearing
205 if (location.speedMetersPerSec > 0.0) { 211 if (location.speedMetersPerSec > 0.0) {
206 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING); 212 EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING);
213 }
207 } 214 }
208 215
209 /* 216 /*
@@ -356,7 +363,7 @@ TEST_F(GnssHalTest, GetLocation) {
356 for (int i = 1; i < LOCATIONS_TO_CHECK; i++) { 363 for (int i = 1; i < LOCATIONS_TO_CHECK; i++) {
357 EXPECT_EQ(std::cv_status::no_timeout, wait(LOCATION_TIMEOUT_SUBSEQUENT_SEC)); 364 EXPECT_EQ(std::cv_status::no_timeout, wait(LOCATION_TIMEOUT_SUBSEQUENT_SEC));
358 EXPECT_EQ(location_called_count_, i + 1); 365 EXPECT_EQ(location_called_count_, i + 1);
359 CheckLocation(last_location_, checkMoreAccuracies); 366 CheckLocation(last_location_, checkMoreAccuracies, true);
360 } 367 }
361 } 368 }
362 369
diff --git a/graphics/composer/2.1/default/Hwc.cpp b/graphics/composer/2.1/default/Hwc.cpp
index 80ec1cdc..fdb4af88 100644
--- a/graphics/composer/2.1/default/Hwc.cpp
+++ b/graphics/composer/2.1/default/Hwc.cpp
@@ -30,8 +30,6 @@
30 30
31using namespace std::chrono_literals; 31using namespace std::chrono_literals;
32 32
33using namespace std::chrono_literals;
34
35namespace android { 33namespace android {
36namespace hardware { 34namespace hardware {
37namespace graphics { 35namespace graphics {
diff --git a/health/2.0/Android.bp b/health/2.0/Android.bp
index 8281a84e..4a4f24b0 100644
--- a/health/2.0/Android.bp
+++ b/health/2.0/Android.bp
@@ -1,186 +1,24 @@
1// This file is autogenerated by hidl-gen. Do not edit manually. 1// This file is autogenerated by hidl-gen -Landroidbp.
2 2
3filegroup { 3hidl_interface {
4 name: "android.hardware.health@2.0_hal",
5 srcs: [
6 "types.hal",
7 "IHealth.hal",
8 "IHealthInfoCallback.hal",
9 ],
10}
11
12genrule {
13 name: "android.hardware.health@2.0_genc++",
14 tools: ["hidl-gen"],
15 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
16 srcs: [
17 ":android.hardware.health@2.0_hal",
18 ],
19 out: [
20 "android/hardware/health/2.0/types.cpp",
21 "android/hardware/health/2.0/HealthAll.cpp",
22 "android/hardware/health/2.0/HealthInfoCallbackAll.cpp",
23 ],
24}
25
26genrule {
27 name: "android.hardware.health@2.0_genc++_headers",
28 tools: ["hidl-gen"],
29 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
30 srcs: [
31 ":android.hardware.health@2.0_hal",
32 ],
33 out: [
34 "android/hardware/health/2.0/types.h",
35 "android/hardware/health/2.0/hwtypes.h",
36 "android/hardware/health/2.0/IHealth.h",
37 "android/hardware/health/2.0/IHwHealth.h",
38 "android/hardware/health/2.0/BnHwHealth.h",
39 "android/hardware/health/2.0/BpHwHealth.h",
40 "android/hardware/health/2.0/BsHealth.h",
41 "android/hardware/health/2.0/IHealthInfoCallback.h",
42 "android/hardware/health/2.0/IHwHealthInfoCallback.h",
43 "android/hardware/health/2.0/BnHwHealthInfoCallback.h",
44 "android/hardware/health/2.0/BpHwHealthInfoCallback.h",
45 "android/hardware/health/2.0/BsHealthInfoCallback.h",
46 ],
47}
48
49cc_library {
50 name: "android.hardware.health@2.0", 4 name: "android.hardware.health@2.0",
51 defaults: ["hidl-module-defaults"], 5 root: "android.hardware",
52 generated_sources: ["android.hardware.health@2.0_genc++"],
53 generated_headers: ["android.hardware.health@2.0_genc++_headers"],
54 export_generated_headers: ["android.hardware.health@2.0_genc++_headers"],
55 vendor_available: true,
56 vndk: { 6 vndk: {
57 enabled: true, 7 enabled: true,
58 }, 8 },
59 shared_libs: [
60 "libhidlbase",
61 "libhidltransport",
62 "libhwbinder",
63 "liblog",
64 "libutils",
65 "libcutils",
66 "android.hardware.health@1.0",
67 ],
68 export_shared_lib_headers: [
69 "libhidlbase",
70 "libhidltransport",
71 "libhwbinder",
72 "libutils",
73 "android.hardware.health@1.0",
74 ],
75}
76
77genrule {
78 name: "android.hardware.health-V2.0-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.health@2.0",
81 srcs: [ 9 srcs: [
82 ":android.hardware.health@2.0_hal", 10 "types.hal",
83 ], 11 "IHealth.hal",
84 out: [ 12 "IHealthInfoCallback.hal",
85 "android/hardware/health/V2_0/HealthInfo.java",
86 "android/hardware/health/V2_0/Result.java",
87 "android/hardware/health/V2_0/IHealth.java",
88 "android/hardware/health/V2_0/IHealthInfoCallback.java",
89 ],
90}
91
92java_library {
93 name: "android.hardware.health-V2.0-java",
94 no_framework_libs: true,
95 defaults: ["hidl-java-module-defaults"],
96 srcs: [":android.hardware.health-V2.0-java_gen_java"],
97 libs: [
98 "hwbinder",
99 "android.hardware.health-V1.0-java",
100 "android.hidl.base-V1.0-java",
101 ]
102}
103
104// This package does not export any types. Not creating java constants export.
105
106
107genrule {
108 name: "android.hardware.health@2.0-adapter-helper_genc++",
109 tools: ["hidl-gen"],
110 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
111 srcs: [
112 ":android.hardware.health@2.0_hal",
113 ],
114 out: [
115 "android/hardware/health/2.0/AHealth.cpp",
116 "android/hardware/health/2.0/AHealthInfoCallback.cpp",
117 ],
118}
119
120genrule {
121 name: "android.hardware.health@2.0-adapter-helper_genc++_headers",
122 tools: ["hidl-gen"],
123 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
124 srcs: [
125 ":android.hardware.health@2.0_hal",
126 ],
127 out: [
128 "android/hardware/health/2.0/AHealth.h",
129 "android/hardware/health/2.0/AHealthInfoCallback.h",
130 ], 13 ],
131} 14 interfaces: [
132
133cc_library {
134 name: "android.hardware.health@2.0-adapter-helper",
135 defaults: ["hidl-module-defaults"],
136 generated_sources: ["android.hardware.health@2.0-adapter-helper_genc++"],
137 generated_headers: ["android.hardware.health@2.0-adapter-helper_genc++_headers"],
138 export_generated_headers: ["android.hardware.health@2.0-adapter-helper_genc++_headers"],
139 vendor_available: true,
140 shared_libs: [
141 "libhidlbase",
142 "libhidltransport",
143 "libhwbinder",
144 "liblog",
145 "libutils",
146 "libcutils",
147 "libhidladapter",
148 "android.hardware.health@1.0", 15 "android.hardware.health@1.0",
149 "android.hardware.health@2.0", 16 "android.hidl.base@1.0",
150 "android.hardware.health@1.0-adapter-helper",
151 "android.hidl.base@1.0-adapter-helper",
152 ], 17 ],
153 export_shared_lib_headers: [ 18 types: [
154 "libhidlbase", 19 "HealthInfo",
155 "libhidltransport", 20 "Result",
156 "libhwbinder",
157 "libutils",
158 "libhidladapter",
159 "android.hardware.health@1.0",
160 "android.hardware.health@2.0",
161 "android.hardware.health@1.0-adapter-helper",
162 "android.hidl.base@1.0-adapter-helper",
163 ], 21 ],
22 gen_java: true,
164} 23}
165 24
166genrule {
167 name: "android.hardware.health@2.0-adapter_genc++",
168 tools: ["hidl-gen"],
169 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
170 out: ["main.cpp"]
171}
172
173cc_test {
174 name: "android.hardware.health@2.0-adapter",
175 defaults: ["hidl-module-defaults"],
176 shared_libs: [
177 "libhidladapter",
178 "libhidlbase",
179 "libhidltransport",
180 "libutils",
181 "android.hardware.health@1.0",
182 "android.hardware.health@2.0",
183 "android.hardware.health@2.0-adapter-helper",
184 ],
185 generated_sources: ["android.hardware.health@2.0-adapter_genc++"],
186}
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
index 9b74a339..034992ec 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
@@ -395,9 +395,9 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL,
395 static const CompToURL kCompToURL[] = { 395 static const CompToURL kCompToURL[] = {
396 {VideoDecHidlTest::standardComp::avc, 396 {VideoDecHidlTest::standardComp::avc,
397 {"bbb_avc_176x144_300kbps_60fps.h264", 397 {"bbb_avc_176x144_300kbps_60fps.h264",
398 "bbb_avc_1920x1080_5000kbps_30fps.h264"}, 398 "bbb_avc_640x360_768kbps_30fps.h264"},
399 {"bbb_avc_176x144_300kbps_60fps.info", 399 {"bbb_avc_176x144_300kbps_60fps.info",
400 "bbb_avc_1920x1080_5000kbps_30fps.info"}}, 400 "bbb_avc_640x360_768kbps_30fps.info"}},
401 {VideoDecHidlTest::standardComp::hevc, 401 {VideoDecHidlTest::standardComp::hevc,
402 {"bbb_hevc_176x144_176kbps_60fps.hevc", 402 {"bbb_hevc_176x144_176kbps_60fps.hevc",
403 "bbb_hevc_640x360_1600kbps_30fps.hevc"}, 403 "bbb_hevc_640x360_1600kbps_30fps.hevc"},
@@ -412,8 +412,8 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL,
412 {"", "bbb_h263_352x288_300kbps_12fps.h263"}, 412 {"", "bbb_h263_352x288_300kbps_12fps.h263"},
413 {"", "bbb_h263_352x288_300kbps_12fps.info"}}, 413 {"", "bbb_h263_352x288_300kbps_12fps.info"}},
414 {VideoDecHidlTest::standardComp::mpeg4, 414 {VideoDecHidlTest::standardComp::mpeg4,
415 {"", "bbb_mpeg4_1280x720_1000kbps_25fps.m4v"}, 415 {"", "bbb_mpeg4_352x288_512kbps_30fps.m4v"},
416 {"", "bbb_mpeg4_1280x720_1000kbps_25fps.info"}}, 416 {"", "bbb_mpeg4_352x288_512kbps_30fps.info"}},
417 {VideoDecHidlTest::standardComp::vp8, 417 {VideoDecHidlTest::standardComp::vp8,
418 {"bbb_vp8_176x144_240kbps_60fps.vp8", 418 {"bbb_vp8_176x144_240kbps_60fps.vp8",
419 "bbb_vp8_640x360_2mbps_30fps.vp8"}, 419 "bbb_vp8_640x360_2mbps_30fps.vp8"},
diff --git a/media/res/bbb_avc_1920x1080_5000kbps_30fps.h264 b/media/res/bbb_avc_1920x1080_5000kbps_30fps.h264
deleted file mode 100644
index cb8f9eba..00000000
--- a/media/res/bbb_avc_1920x1080_5000kbps_30fps.h264
+++ /dev/null
Binary files differ
diff --git a/media/res/bbb_avc_1920x1080_5000kbps_30fps.info b/media/res/bbb_avc_1920x1080_5000kbps_30fps.info
deleted file mode 100644
index feaf9748..00000000
--- a/media/res/bbb_avc_1920x1080_5000kbps_30fps.info
+++ /dev/null
@@ -1,242 +0,0 @@
131 128 0
28 128 0
3481702 32 0
4137895 0 33333
581863 0 100000
698914 0 133333
76855 0 166666
82738 0 200000
91340 0 266666
101680 0 300000
112217 0 333333
123275 0 366666
133509 0 433333
144688 0 466666
154996 0 500000
166057 0 533333
177061 0 600000
187427 0 633333
197484 0 666666
208361 0 700000
217803 0 766666
228506 0 800000
238132 0 833333
248651 0 866666
258424 0 933333
268861 0 966666
279004 0 1000000
289431 0 1033333
298854 0 1100000
309681 0 1133333
319498 0 1166666
329694 0 1200000
3317571 0 1266666
3410029 0 1300000
3510022 0 1333333
369939 0 1366666
378427 0 1433333
389522 0 1466666
397192 0 1500000
409844 0 1533333
415693 0 1600000
428057 0 1633333
435997 0 1666666
444028 0 1700000
452303 0 1766666
46845 0 1800000
47191414 32 1833333
4813266 0 1866666
4916120 0 1933333
5019751 0 1966666
516559 0 2000000
528098 0 2033333
538596 0 2100000
549331 0 2133333
559908 0 2166666
5613843 0 2200000
5713776 0 2266666
5814556 0 2300000
5914524 0 2333333
6015089 0 2366666
6114666 0 2433333
6215552 0 2466666
6315020 0 2500000
6416506 0 2533333
6515664 0 2600000
6616499 0 2633333
6716113 0 2666666
6816924 0 2700000
6915948 0 2766666
7017219 0 2800000
7116448 0 2833333
7217729 0 2866666
7316884 0 2933333
7417941 0 2966666
7517215 0 3000000
7618159 0 3033333
7717424 0 3100000
7818479 0 3133333
7917255 0 3166666
8018463 0 3200000
8118723 0 3266666
8219291 0 3300000
8318297 0 3333333
8419633 0 3366666
8518719 0 3433333
8620323 0 3466666
8717035 0 3500000
8819071 0 3533333
8917921 0 3600000
9019198 0 3633333
9118723 0 3666666
9219036 0 3700000
9318735 0 3766666
9419613 0 3800000
9518537 0 3833333
9620868 0 3866666
9716731 0 3933333
9819380 0 3966666
9918409 0 4000000
10019580 0 4033333
10118465 0 4100000
10220104 0 4133333
10316783 0 4166666
10419341 0 4200000
10518674 0 4266666
10619983 0 4300000
10719154 0 4333333
10819750 0 4366666
10919483 0 4433333
11021206 0 4466666
11117608 0 4500000
11220220 0 4533333
11318918 0 4600000
11419494 0 4633333
11519072 0 4666666
11619786 0 4700000
11718540 0 4766666
11819638 0 4800000
11918656 0 4833333
12019453 0 4866666
12119673 0 4933333
12217616 0 4966666
12318317 0 5000000
12418749 0 5033333
12518193 0 5100000
12618732 0 5133333
12718186 0 5166666
12818271 0 5200000
12918256 0 5266666
13016806 0 5300000
13117119 0 5333333
13216466 0 5366666
13315315 0 5433333
13414877 0 5466666
13513235 0 5500000
13613025 0 5533333
13710305 0 5600000
13810120 0 5633333
1397706 0 5666666
140112698 32 5700000
1411544 0 5766666
1421285 0 5800000
1431576 0 5833333
1441714 0 5866666
1451384 0 5933333
1461551 0 5966666
1473916 0 6000000
1488019 0 6033333
1498304 0 6100000
1508416 0 6133333
1518086 0 6166666
1528452 0 6200000
1539205 0 6266666
15411098 0 6300000
15519805 0 6333333
15618292 0 6366666
15714974 0 6433333
15810425 0 6466666
1599997 0 6500000
1608832 0 6533333
1617909 0 6600000
1626400 0 6633333
1635939 0 6666666
1645965 0 6700000
1656221 0 6766666
1666522 0 6800000
1677062 0 6833333
1686877 0 6866666
1696859 0 6933333
1706550 0 6966666
1716127 0 7000000
1725386 0 7033333
1735092 0 7100000
1744370 0 7133333
1754048 0 7166666
1763922 0 7200000
17711453 0 7266666
17816041 0 7300000
17916756 0 7333333
1808616 0 7366666
1819856 0 7433333
18214997 0 7466666
18318365 0 7500000
18421295 0 7533333
18519335 0 7600000
18613689 0 7633333
18714147 0 7666666
18813198 0 7700000
18910999 0 7766666
1907726 0 7800000
1918744 0 7833333
19211321 0 7866666
19314840 0 7933333
19421702 0 7966666
19527091 0 8000000
19628992 0 8033333
19726391 0 8100000
19813809 0 8133333
19911196 0 8166666
20010494 0 8200000
2019921 0 8266666
2027637 0 8300000
2037301 0 8333333
2046890 0 8366666
2059059 0 8433333
2069324 0 8466666
20710277 0 8500000
20810436 0 8533333
20910635 0 8600000
2109554 0 8633333
2118268 0 8666666
2128450 0 8700000
2138430 0 8766666
2148258 0 8800000
2158879 0 8833333
2168050 0 8866666
2177963 0 8933333
2188974 0 8966666
21910037 0 9000000
2208547 0 9033333
2216424 0 9100000
2225672 0 9133333
2236159 0 9166666
2246498 0 9200000
2257064 0 9266666
2266673 0 9300000
2276959 0 9333333
2286226 0 9366666
2296312 0 9433333
2308893 0 9466666
2318253 0 9500000
2325876 0 9533333
2335867 0 9600000
2346212 0 9633333
2356984 0 9666666
2366220 0 9700000
2376993 0 9766666
23815014 0 9800000
23922390 0 9833333
24029552 0 9866666
24124024 0 9933333
24215820 0 9966666
diff --git a/media/res/bbb_avc_640x360_768kbps_30fps.h264 b/media/res/bbb_avc_640x360_768kbps_30fps.h264
new file mode 100755
index 00000000..1d8c68f1
--- /dev/null
+++ b/media/res/bbb_avc_640x360_768kbps_30fps.h264
Binary files differ
diff --git a/media/res/bbb_avc_640x360_768kbps_30fps.info b/media/res/bbb_avc_640x360_768kbps_30fps.info
new file mode 100755
index 00000000..8195c336
--- /dev/null
+++ b/media/res/bbb_avc_640x360_768kbps_30fps.info
@@ -0,0 +1,242 @@
129 128 0
29 128 0
338469 32 66666
43270 0 200000
5443 0 133333
6246 0 100000
7214 0 166666
82280 0 300000
9368 0 233333
10238 0 266666
11688 0 433333
12287 0 366666
13234 0 333333
14172 0 400000
151363 0 566666
16273 0 500000
17166 0 466666
18182 0 533333
193731 0 700000
20349 0 633333
21216 0 600000
22229 0 666666
236061 0 833333
24408 0 766666
25271 0 733333
26241 0 800000
277004 0 966666
28442 0 900000
29261 0 866666
30229 0 933333
317354 0 1100000
32404 0 1033333
33264 0 1000000
34198 0 1066666
354542 0 1233333
36286 0 1166666
37205 0 1133333
38131 0 1200000
393329 0 1333333
40216 0 1266666
41136 0 1300000
422353 0 1366666
43986 0 1400000
44808 0 1433333
45318 0 1466666
4662 0 1500000
4755649 32 1533333
481606 0 1566666
492935 0 1600000
503564 0 1633333
513324 0 1666666
524543 0 1700000
531740 0 1733333
542737 0 1766666
552762 0 1800000
563185 0 1833333
573238 0 1866666
583395 0 1900000
593421 0 1933333
603482 0 1966666
613370 0 2000000
623656 0 2033333
633509 0 2066666
643684 0 2100000
653732 0 2133333
663366 0 2166666
673374 0 2200000
683202 0 2233333
693449 0 2266666
703360 0 2300000
713372 0 2333333
723460 0 2366666
733511 0 2400000
743471 0 2433333
753330 0 2466666
763377 0 2500000
773744 0 2533333
783667 0 2566666
793867 0 2600000
803776 0 2633333
813329 0 2666666
823876 0 2700000
833385 0 2733333
843566 0 2766666
853301 0 2800000
863570 0 2833333
873132 0 2866666
883487 0 2900000
893270 0 2933333
903472 0 2966666
913487 0 3000000
923503 0 3033333
933443 0 3066666
943528 0 3100000
953258 0 3133333
963707 0 3166666
973120 0 3200000
983347 0 3233333
993372 0 3266666
1003161 0 3300000
1013393 0 3333333
1023399 0 3366666
1032905 0 3400000
1043543 0 3433333
1053103 0 3466666
1063099 0 3500000
1073457 0 3533333
1083191 0 3566666
1093290 0 3600000
1103312 0 3633333
1112955 0 3666666
1123341 0 3700000
1133102 0 3733333
1143186 0 3766666
1153180 0 3800000
1162839 0 3833333
1173089 0 3866666
1183110 0 3900000
1193165 0 3933333
1202684 0 3966666
1213082 0 4000000
1222694 0 4033333
1233051 0 4066666
1243002 0 4100000
1252929 0 4133333
1262676 0 4166666
1272411 0 4200000
1282874 0 4233333
1292572 0 4266666
1302420 0 4300000
1312500 0 4333333
1322137 0 4366666
1332344 0 4400000
1342028 0 4433333
1351754 0 4466666
1361627 0 4500000
1371375 0 4533333
1381069 0 4566666
139801 0 4600000
14021689 32 4633333
141261 0 4733333
14276 0 4666666
14345 0 4700000
144334 0 4800000
14561 0 4766666
1461577 0 4933333
147280 0 4866666
14872 0 4833333
149479 0 4900000
1502181 0 5066666
151919 0 5000000
152349 0 4966666
153534 0 5033333
1544860 0 5166666
155759 0 5100000
156677 0 5133333
1573101 0 5300000
158498 0 5233333
159327 0 5200000
160213 0 5266666
1611640 0 5433333
162259 0 5366666
163162 0 5333333
164148 0 5400000
1652130 0 5566666
166397 0 5500000
167191 0 5466666
168180 0 5533333
1691757 0 5700000
170338 0 5633333
171194 0 5600000
172141 0 5666666
1731103 0 5833333
174289 0 5766666
175149 0 5733333
176148 0 5800000
1773914 0 5966666
1781025 0 5900000
179714 0 5866666
180428 0 5933333
1814604 0 6100000
1821456 0 6033333
183699 0 6000000
184892 0 6066666
1854535 0 6233333
1861301 0 6166666
187708 0 6133333
188592 0 6200000
1892175 0 6333333
190603 0 6266666
191411 0 6300000
1921813 0 6366666
1935055 0 6466666
1941538 0 6400000
1952201 0 6433333
1966249 0 6533333
1971420 0 6500000
1982254 0 6566666
1992441 0 6633333
200293 0 6600000
2012062 0 6700000
202213 0 6666666
2032455 0 6800000
204344 0 6733333
205204 0 6766666
2063920 0 6933333
207751 0 6866666
208376 0 6833333
209337 0 6900000
2102882 0 7066666
211457 0 7000000
212222 0 6966666
213184 0 7033333
2142734 0 7200000
215472 0 7133333
216185 0 7100000
217250 0 7166666
2182735 0 7333333
219301 0 7266666
220307 0 7233333
221109 0 7300000
2221852 0 7466666
223322 0 7400000
224153 0 7366666
225195 0 7433333
2261506 0 7600000
227350 0 7533333
228170 0 7500000
229145 0 7566666
2302123 0 7733333
231430 0 7666666
232364 0 7633333
233190 0 7700000
2341296 0 7800000
235196 0 7766666
236858 0 7833333
2373865 0 7933333
238693 0 7866666
2391606 0 7900000
2404884 0 7966666
2412821 0 8033333
2422211 0 8000000
diff --git a/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.info b/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.info
deleted file mode 100644
index b05a44c8..00000000
--- a/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.info
+++ /dev/null
@@ -1,251 +0,0 @@
149 128 0
249 128 0
357542 32 0
450961 0 40000
529136 0 80000
628146 0 120000
725472 0 160000
85752 0 200000
94373 0 240000
104261 0 280000
115083 0 320000
126504 0 360000
135080 0 400000
145688 0 440000
1550834 32 480000
164559 0 520000
174118 0 560000
183937 0 600000
194262 0 640000
204649 0 680000
213995 0 720000
223899 0 760000
233896 0 800000
243998 0 840000
254129 0 880000
264064 0 920000
2742872 32 960000
283265 0 1000000
292506 0 1040000
302178 0 1080000
312445 0 1120000
322461 0 1160000
333267 0 1200000
342700 0 1240000
352924 0 1280000
362405 0 1320000
372656 0 1360000
382494 0 1400000
3947454 32 1440000
402956 0 1480000
411434 0 1520000
42707 0 1560000
431310 0 1600000
441791 0 1640000
452088 0 1680000
461078 0 1720000
47738 0 1760000
4874837 32 1800000
493304 0 1840000
503656 0 1880000
512822 0 1920000
522566 0 1960000
532816 0 2000000
542590 0 2040000
552471 0 2080000
562553 0 2120000
572547 0 2160000
582628 0 2200000
592664 0 2240000
6038161 32 2280000
612995 0 2320000
622205 0 2360000
632055 0 2400000
642122 0 2440000
652236 0 2480000
662407 0 2520000
67893 0 2560000
682511 0 2600000
692703 0 2640000
702511 0 2680000
712564 0 2720000
7235944 32 2760000
733002 0 2800000
742188 0 2840000
752109 0 2880000
762058 0 2920000
772242 0 2960000
782240 0 3000000
792346 0 3040000
802223 0 3080000
812430 0 3120000
822486 0 3160000
832379 0 3200000
8434014 32 3240000
853009 0 3280000
862073 0 3320000
872005 0 3360000
882052 0 3400000
892167 0 3440000
902331 0 3480000
912201 0 3520000
92896 0 3560000
932594 0 3600000
942589 0 3640000
952542 0 3680000
9633973 32 3720000
972913 0 3760000
981978 0 3800000
991943 0 3840000
1001983 0 3880000
1012234 0 3920000
1022142 0 3960000
1032106 0 4000000
1042253 0 4040000
1052327 0 4080000
1062186 0 4120000
1072366 0 4160000
10832094 32 4200000
1093050 0 4240000
1101913 0 4280000
1112016 0 4320000
1122097 0 4360000
1132112 0 4400000
1142163 0 4440000
1152258 0 4480000
1162231 0 4520000
117882 0 4560000
1182575 0 4600000
1192700 0 4640000
12033754 32 4680000
1213011 0 4720000
1222034 0 4760000
1231986 0 4800000
1241983 0 4840000
1252180 0 4880000
1262067 0 4920000
1272262 0 4960000
1282323 0 5000000
1292367 0 5040000
1302289 0 5080000
1312263 0 5120000
13231806 32 5160000
1333285 0 5200000
1341957 0 5240000
1352073 0 5280000
1362057 0 5320000
1372134 0 5360000
1382086 0 5400000
1392217 0 5440000
1402314 0 5480000
1412176 0 5520000
142852 0 5560000
1432421 0 5600000
14437236 32 5640000
14516140 32 5680000
1463491 0 5720000
1472891 0 5760000
1481499 0 5800000
149659 0 5840000
150652 0 5880000
151648 0 5920000
1521892 0 5960000
1533050 0 6000000
1542235 0 6040000
1551925 0 6080000
1561790 0 6120000
15716441 32 6160000
1585341 0 6200000
1592445 0 6240000
1602878 0 6280000
1612366 0 6320000
1621732 0 6360000
1631858 0 6400000
1641632 0 6440000
1651514 0 6480000
1661874 0 6520000
1671059 0 6560000
1681795 0 6600000
16920153 32 6640000
1703589 0 6680000
1712418 0 6720000
1721896 0 6760000
1731577 0 6800000
1741629 0 6840000
1751717 0 6880000
1761717 0 6920000
1771815 0 6960000
1781663 0 7000000
1791855 0 7040000
1801699 0 7080000
18121184 32 7120000
1823395 0 7160000
1833276 0 7200000
1843825 0 7240000
1852747 0 7280000
1861684 0 7320000
1872141 0 7360000
1882372 0 7400000
1892777 0 7440000
1902828 0 7480000
1912442 0 7520000
1921302 0 7560000
19320702 32 7600000
1944043 0 7640000
1952875 0 7680000
1962026 0 7720000
1971983 0 7760000
1982173 0 7800000
1992670 0 7840000
2003145 0 7880000
2015312 0 7920000
2025547 0 7960000
2034262 0 8000000
2042637 0 8040000
20515761 32 8080000
2062693 0 8120000
2071433 0 8160000
2082108 0 8200000
2092253 0 8240000
2101846 0 8280000
2111281 0 8320000
2122294 0 8360000
2132217 0 8400000
2142370 0 8440000
2151809 0 8480000
2161899 0 8520000
21721630 32 8560000
2183189 0 8600000
2191679 0 8640000
2201732 0 8680000
2211672 0 8720000
2221788 0 8760000
2231656 0 8800000
2241765 0 8840000
2251579 0 8880000
2262142 0 8920000
2271954 0 8960000
2281854 0 9000000
22924966 32 9040000
2302176 0 9080000
2311236 0 9120000
2321282 0 9160000
2331526 0 9200000
2341369 0 9240000
2351283 0 9280000
2361434 0 9320000
2371335 0 9360000
2382144 0 9400000
2391917 0 9440000
2401409 0 9480000
24127745 32 9520000
2421905 0 9560000
2431495 0 9600000
2441685 0 9640000
2451745 0 9680000
2461894 0 9720000
2473667 0 9760000
2485546 0 9800000
2495729 0 9840000
2504479 0 9880000
2513829 0 9920000
diff --git a/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.m4v b/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.m4v
deleted file mode 100644
index ec32d5ed..00000000
--- a/media/res/bbb_mpeg4_1280x720_1000kbps_25fps.m4v
+++ /dev/null
Binary files differ
diff --git a/media/res/bbb_mpeg4_352x288_512kbps_30fps.info b/media/res/bbb_mpeg4_352x288_512kbps_30fps.info
new file mode 100755
index 00000000..326a3e18
--- /dev/null
+++ b/media/res/bbb_mpeg4_352x288_512kbps_30fps.info
@@ -0,0 +1,241 @@
147 128 0
221115 32 0
316456 0 33333
411880 0 66666
512155 0 100000
611402 0 133333
75345 0 166666
82986 0 200000
91924 0 233333
102275 0 266666
112793 0 300000
122756 0 333333
132933 0 366666
1421100 32 400000
151302 0 433333
162206 0 466666
171599 0 500000
182558 0 533333
192784 0 566666
202458 0 600000
212480 0 633333
221446 0 666666
233109 0 700000
24944 0 733333
253134 0 766666
2621342 32 800000
27652 0 833333
281708 0 866666
292202 0 900000
301695 0 933333
311661 0 966666
321652 0 1000000
331679 0 1033333
341690 0 1066666
351824 0 1100000
361803 0 1133333
371598 0 1166666
3821540 32 1200000
39205 0 1233333
401124 0 1266666
411069 0 1300000
42838 0 1333333
43765 0 1366666
444265 0 1400000
4594 0 1433333
4620463 0 1466666
471028 0 1500000
481475 0 1533333
493630 0 1566666
5028373 32 1600000
51725 0 1633333
521119 0 1666666
531427 0 1700000
541679 0 1733333
551866 0 1766666
561197 0 1800000
571572 0 1833333
581651 0 1866666
591678 0 1900000
601688 0 1933333
611659 0 1966666
6219900 32 2000000
63584 0 2033333
641475 0 2066666
651678 0 2100000
661010 0 2133333
671435 0 2166666
681612 0 2200000
691602 0 2233333
701709 0 2266666
711737 0 2300000
721835 0 2333333
73926 0 2366666
7420090 32 2400000
75631 0 2433333
761576 0 2466666
77941 0 2500000
782349 0 2533333
791112 0 2566666
801566 0 2600000
811773 0 2633333
82979 0 2666666
832246 0 2700000
84904 0 2733333
851342 0 2766666
8620147 32 2800000
87630 0 2833333
88982 0 2866666
892089 0 2900000
901021 0 2933333
911506 0 2966666
921642 0 3000000
93968 0 3033333
941262 0 3066666
952270 0 3100000
96864 0 3133333
971252 0 3166666
9820145 32 3200000
99595 0 3233333
100918 0 3266666