Merge changes Ia5d46ad8,I60cec00d into oc-dr1-dev am: e65f392b6f am: 94310da891
am: 80c5dd0419
Change-Id: I2bd9955579e84e25bd94a6eaa651472e3045b7a2
diff --git a/audio/OWNERS b/audio/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/V2_0/build/Android.bp b/audio/V2_0/build/Android.bp
index 4266f1a..418a604 100644
--- a/audio/V2_0/build/Android.bp
+++ b/audio/V2_0/build/Android.bp
@@ -90,11 +90,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -159,11 +154,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/audio/V2_0/target/AndroidTest.xml b/audio/V2_0/target/AndroidTest.xml
index 5172392..a54f8b1 100644
--- a/audio/V2_0/target/AndroidTest.xml
+++ b/audio/V2_0/target/AndroidTest.xml
@@ -29,5 +29,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.audio@2.0"/>
<option name="test-timeout" value="30m"/>
+ <option name="gtest-batch-mode" value="true"/>
</test>
</configuration>
diff --git a/audio/V2_0/target_profiling/AndroidTest.xml b/audio/V2_0/target_profiling/AndroidTest.xml
index 2141730..df9f0aa 100644
--- a/audio/V2_0/target_profiling/AndroidTest.xml
+++ b/audio/V2_0/target_profiling/AndroidTest.xml
@@ -34,6 +34,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.audio@2.0"/>
- <option name="test-timeout" value="30m"/>
+ <option name="test-timeout" value="60m"/>
+ <option name="gtest-batch-mode" value="true"/>
</test>
</configuration>
diff --git a/audio/common/V2_0/build/Android.bp b/audio/common/V2_0/build/Android.bp
index 0d49052..65ac801 100644
--- a/audio/common/V2_0/build/Android.bp
+++ b/audio/common/V2_0/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/audio/effect/V2_0/build/Android.bp b/audio/effect/V2_0/build/Android.bp
index f2937ba..c41b309 100644
--- a/audio/effect/V2_0/build/Android.bp
+++ b/audio/effect/V2_0/build/Android.bp
@@ -111,11 +111,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -194,11 +189,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/automotive/evs/V1_0/build/Android.bp b/automotive/evs/V1_0/build/Android.bp
index 87aef34..37a63f6 100644
--- a/automotive/evs/V1_0/build/Android.bp
+++ b/automotive/evs/V1_0/build/Android.bp
@@ -79,11 +79,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -141,11 +136,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/automotive/vehicle/V2_0/build/Android.bp b/automotive/vehicle/V2_0/build/Android.bp
index 514ae0f..175c719 100644
--- a/automotive/vehicle/V2_0/build/Android.bp
+++ b/automotive/vehicle/V2_0/build/Android.bp
@@ -73,11 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -131,11 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/automotive/vehicle/V2_1/build/Android.bp b/automotive/vehicle/V2_1/build/Android.bp
index 8921d1a..bdeb527 100644
--- a/automotive/vehicle/V2_1/build/Android.bp
+++ b/automotive/vehicle/V2_1/build/Android.bp
@@ -72,11 +72,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -129,11 +124,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/biometrics/fingerprint/V2_1/build/Android.bp b/biometrics/fingerprint/V2_1/build/Android.bp
index c4fb80e..fc18edb 100644
--- a/biometrics/fingerprint/V2_1/build/Android.bp
+++ b/biometrics/fingerprint/V2_1/build/Android.bp
@@ -73,11 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -131,11 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/broadcastradio/V1_0/OWNERS b/broadcastradio/V1_0/OWNERS
new file mode 100644
index 0000000..b159083
--- /dev/null
+++ b/broadcastradio/V1_0/OWNERS
@@ -0,0 +1,4 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+twasilczyk@google.com
diff --git a/broadcastradio/V1_0/build/Android.bp b/broadcastradio/V1_0/build/Android.bp
index 04244cd..d278590 100644
--- a/broadcastradio/V1_0/build/Android.bp
+++ b/broadcastradio/V1_0/build/Android.bp
@@ -79,11 +79,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -141,11 +136,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/broadcastradio/V1_1/build/Android.bp b/broadcastradio/V1_1/build/Android.bp
index f64c410..dd8b7bc 100644
--- a/broadcastradio/V1_1/build/Android.bp
+++ b/broadcastradio/V1_1/build/Android.bp
@@ -81,11 +81,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -144,11 +139,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/broadcastradio/V1_1/target/AndroidTest.xml b/broadcastradio/V1_1/target/AndroidTest.xml
index 00c6a69..4efea71 100644
--- a/broadcastradio/V1_1/target/AndroidTest.xml
+++ b/broadcastradio/V1_1/target/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalBroadcastradioV1_0Target test cases">
+<configuration description="Config for VTS VtsHalBroadcastradioV1_1Target test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HalHidlTargetTest.push"/>
diff --git a/camera/common/V1_0/build/Android.bp b/camera/common/V1_0/build/Android.bp
index 47e91b2..cb2a7b1 100644
--- a/camera/common/V1_0/build/Android.bp
+++ b/camera/common/V1_0/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/camera/device/V1_0/build/Android.bp b/camera/device/V1_0/build/Android.bp
index 8232106..8fd2191 100644
--- a/camera/device/V1_0/build/Android.bp
+++ b/camera/device/V1_0/build/Android.bp
@@ -82,11 +82,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -145,11 +140,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/camera/device/V3_2/build/Android.bp b/camera/device/V3_2/build/Android.bp
index 9094150..852d717 100644
--- a/camera/device/V3_2/build/Android.bp
+++ b/camera/device/V3_2/build/Android.bp
@@ -82,11 +82,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -145,11 +140,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/camera/metadata/V3_2/build/Android.bp b/camera/metadata/V3_2/build/Android.bp
index ca9b055..0b184d6 100644
--- a/camera/metadata/V3_2/build/Android.bp
+++ b/camera/metadata/V3_2/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/camera/provider/V2_4/build/Android.bp b/camera/provider/V2_4/build/Android.bp
index e80e66c..03c6dfc 100644
--- a/camera/provider/V2_4/build/Android.bp
+++ b/camera/provider/V2_4/build/Android.bp
@@ -84,11 +84,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -147,11 +142,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/cas/Android.bp b/cas/Android.bp
new file mode 100644
index 0000000..8c4fa06
--- /dev/null
+++ b/cas/Android.bp
@@ -0,0 +1,7 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+subdirs = [
+ "V1_0",
+ "native/V1_0",
+]
diff --git a/cas/V1_0/Android.bp b/cas/V1_0/Android.bp
new file mode 100644
index 0000000..995dd5b
--- /dev/null
+++ b/cas/V1_0/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/cas/V1_0/build/Android.bp b/cas/V1_0/build/Android.bp
new file mode 100644
index 0000000..e506f82
--- /dev/null
+++ b/cas/V1_0/build/Android.bp
@@ -0,0 +1,141 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.cas@1.0-vts.spec",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts",
+ "android/hardware/cas/1.0/CasListener.vts",
+ "android/hardware/cas/1.0/DescramblerBase.vts",
+ "android/hardware/cas/1.0/MediaCasService.vts",
+ "android/hardware/cas/1.0/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.cas@1.0-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.cpp",
+ "android/hardware/cas/1.0/CasListener.vts.cpp",
+ "android/hardware/cas/1.0/DescramblerBase.vts.cpp",
+ "android/hardware/cas/1.0/MediaCasService.vts.cpp",
+ "android/hardware/cas/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas@1.0-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.h",
+ "android/hardware/cas/1.0/CasListener.vts.h",
+ "android/hardware/cas/1.0/DescramblerBase.vts.h",
+ "android/hardware/cas/1.0/MediaCasService.vts.h",
+ "android/hardware/cas/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas@1.0-vts.driver",
+ generated_sources: ["android.hardware.cas@1.0-vts.driver_genc++"],
+ generated_headers: ["android.hardware.cas@1.0-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas@1.0-vts.driver_genc++_headers"],
+ shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libprotobuf-cpp-full",
+ "libutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_drivercomm",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "android.hidl.allocator@1.0",
+ "android.hardware.cas@1.0",
+
+ ],
+ export_shared_lib_headers: [
+
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.cas@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.cpp",
+ "android/hardware/cas/1.0/CasListener.vts.cpp",
+ "android/hardware/cas/1.0/DescramblerBase.vts.cpp",
+ "android/hardware/cas/1.0/MediaCasService.vts.cpp",
+ "android/hardware/cas/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.h",
+ "android/hardware/cas/1.0/CasListener.vts.h",
+ "android/hardware/cas/1.0/DescramblerBase.vts.h",
+ "android/hardware/cas/1.0/MediaCasService.vts.h",
+ "android/hardware/cas/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas@1.0-vts.profiler",
+ generated_sources: ["android.hardware.cas@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.cas@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas@1.0-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_common",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hardware.cas@1.0",
+
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
diff --git a/cas/native/V1_0/Android.bp b/cas/native/V1_0/Android.bp
new file mode 100644
index 0000000..995dd5b
--- /dev/null
+++ b/cas/native/V1_0/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/cas/native/V1_0/build/Android.bp b/cas/native/V1_0/build/Android.bp
new file mode 100644
index 0000000..ff5edb6
--- /dev/null
+++ b/cas/native/V1_0/build/Android.bp
@@ -0,0 +1,129 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.cas.native@1.0-vts.spec",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts",
+ "android/hardware/cas/native/1.0/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
+ "android/hardware/cas/native/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.h",
+ "android/hardware/cas/native/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas.native@1.0-vts.driver",
+ generated_sources: ["android.hardware.cas.native@1.0-vts.driver_genc++"],
+ generated_headers: ["android.hardware.cas.native@1.0-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas.native@1.0-vts.driver_genc++_headers"],
+ shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libprotobuf-cpp-full",
+ "libutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_drivercomm",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "android.hidl.allocator@1.0",
+ "android.hardware.cas.native@1.0",
+ "android.hardware.cas@1.0",
+ "android.hardware.cas@1.0-vts.driver",
+ ],
+ export_shared_lib_headers: [
+ "android.hardware.cas@1.0",
+ "android.hardware.cas@1.0-vts.driver",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
+ "android/hardware/cas/native/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.h",
+ "android/hardware/cas/native/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas.native@1.0-vts.profiler",
+ generated_sources: ["android.hardware.cas.native@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.cas.native@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas.native@1.0-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_common",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hardware.cas.native@1.0",
+ "android.hardware.cas@1.0",
+ "android.hardware.cas@1.0-vts.profiler",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
diff --git a/configstore/V1_1/build/Android.bp b/configstore/V1_1/build/Android.bp
index ef5dd2f..0ac6754 100644
--- a/configstore/V1_1/build/Android.bp
+++ b/configstore/V1_1/build/Android.bp
@@ -69,14 +69,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -127,14 +119,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/contexthub/V1_0/build/Android.bp b/contexthub/V1_0/build/Android.bp
index f1af8e5..64ff393 100644
--- a/contexthub/V1_0/build/Android.bp
+++ b/contexthub/V1_0/build/Android.bp
@@ -73,11 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -131,11 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/drm/V1_0/build/Android.bp b/drm/V1_0/build/Android.bp
index 81bb65c..7593b53 100644
--- a/drm/V1_0/build/Android.bp
+++ b/drm/V1_0/build/Android.bp
@@ -82,11 +82,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -146,11 +141,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/dumpstate/V1_0/build/Android.bp b/dumpstate/V1_0/build/Android.bp
index 27c5f48..bb5277a 100644
--- a/dumpstate/V1_0/build/Android.bp
+++ b/dumpstate/V1_0/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/gatekeeper/V1_0/build/Android.bp b/gatekeeper/V1_0/build/Android.bp
index b9d3330..64e022c 100644
--- a/gatekeeper/V1_0/build/Android.bp
+++ b/gatekeeper/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/gnss/V1_0/build/Android.bp b/gnss/V1_0/build/Android.bp
index 338033f..0d2696f 100644
--- a/gnss/V1_0/build/Android.bp
+++ b/gnss/V1_0/build/Android.bp
@@ -127,11 +127,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -221,11 +216,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/graphics/allocator/V2_0/build/Android.bp b/graphics/allocator/V2_0/build/Android.bp
index ed5ddd2..0bbdd7f 100644
--- a/graphics/allocator/V2_0/build/Android.bp
+++ b/graphics/allocator/V2_0/build/Android.bp
@@ -69,11 +69,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -124,11 +119,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/graphics/bufferqueue/V1_0/build/Android.bp b/graphics/bufferqueue/V1_0/build/Android.bp
index d9a996c..fd39859 100644
--- a/graphics/bufferqueue/V1_0/build/Android.bp
+++ b/graphics/bufferqueue/V1_0/build/Android.bp
@@ -76,11 +76,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -135,11 +130,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/graphics/common/V1_0/build/Android.bp b/graphics/common/V1_0/build/Android.bp
index e5c1d82..786f4c7 100644
--- a/graphics/common/V1_0/build/Android.bp
+++ b/graphics/common/V1_0/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/graphics/composer/V2_1/build/Android.bp b/graphics/composer/V2_1/build/Android.bp
index 9ed171a..1d76063 100644
--- a/graphics/composer/V2_1/build/Android.bp
+++ b/graphics/composer/V2_1/build/Android.bp
@@ -78,11 +78,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -139,11 +134,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/graphics/mapper/V2_0/build/Android.bp b/graphics/mapper/V2_0/build/Android.bp
index 0af0d66..dfa2c50 100644
--- a/graphics/mapper/V2_0/build/Android.bp
+++ b/graphics/mapper/V2_0/build/Android.bp
@@ -72,11 +72,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -129,11 +124,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/health/V1_0/build/Android.bp b/health/V1_0/build/Android.bp
index ea7c913..82a3074 100644
--- a/health/V1_0/build/Android.bp
+++ b/health/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/keymaster/V3_0/build/Android.bp b/keymaster/V3_0/build/Android.bp
index c8f9127..5d03d18 100644
--- a/keymaster/V3_0/build/Android.bp
+++ b/keymaster/V3_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/keymaster/V3_0/target_profiling/AndroidTest.xml b/keymaster/V3_0/target_profiling/AndroidTest.xml
index 8778c55..ff9b78d 100644
--- a/keymaster/V3_0/target_profiling/AndroidTest.xml
+++ b/keymaster/V3_0/target_profiling/AndroidTest.xml
@@ -16,7 +16,7 @@
<configuration description="Config for VTS VtsHalKeymasterV3_0TargetProfiling test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
- <option name="push-group" value="HalHidlHostTest.push"/>
+ <option name="push-group" value="HalHidlTargetProfilingTest.push"/>
<option name="push" value="DATA/lib/android.hardware.keymaster@3.0-vts.profiler.so->/data/local/tmp/32/android.hardware.keymaster@3.0-vts.profiler.so"/>
<option name="push" value="DATA/lib64/android.hardware.keymaster@3.0-vts.profiler.so->/data/local/tmp/64/android.hardware.keymaster@3.0-vts.profiler.so"/>
</target_preparer>
diff --git a/light/V2_0/build/Android.bp b/light/V2_0/build/Android.bp
index ea2a888..5a85f7c 100644
--- a/light/V2_0/build/Android.bp
+++ b/light/V2_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/media/V1_0/build/Android.bp b/media/V1_0/build/Android.bp
index 1ea4f95..ee80302 100644
--- a/media/V1_0/build/Android.bp
+++ b/media/V1_0/build/Android.bp
@@ -69,11 +69,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -124,11 +119,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/media/omx/V1_0/build/Android.bp b/media/omx/V1_0/build/Android.bp
index 0465545..4b5ecdb 100644
--- a/media/omx/V1_0/build/Android.bp
+++ b/media/omx/V1_0/build/Android.bp
@@ -95,11 +95,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -166,11 +161,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/media/omx/V1_0/host/AndroidTest.xml b/media/omx/V1_0/host/AndroidTest.xml
index 0a5b863..938e67c 100644
--- a/media/omx/V1_0/host/AndroidTest.xml
+++ b/media/omx/V1_0/host/AndroidTest.xml
@@ -88,5 +88,6 @@
<option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
<option name="precondition-lshal" value="android.hardware.media.omx@1.0"/>
<option name="test-timeout" value="2h"/>
+ <option name="runtime-hint" value="10m"/>
</test>
</configuration>
diff --git a/memtrack/V1_0/build/Android.bp b/memtrack/V1_0/build/Android.bp
index 0da1ffe..282fa0f 100644
--- a/memtrack/V1_0/build/Android.bp
+++ b/memtrack/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/oemlock/V1_0/build/Android.bp b/oemlock/V1_0/build/Android.bp
index 3dfaa93..ae72a0c 100644
--- a/oemlock/V1_0/build/Android.bp
+++ b/oemlock/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/power/V1_0/build/Android.bp b/power/V1_0/build/Android.bp
index a2c74b8..190eb47 100644
--- a/power/V1_0/build/Android.bp
+++ b/power/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/power/V1_1/build/Android.bp b/power/V1_1/build/Android.bp
index 3d9e3ad..a10f4fd 100644
--- a/power/V1_1/build/Android.bp
+++ b/power/V1_1/build/Android.bp
@@ -72,14 +72,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -132,14 +124,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/sensors/V1_0/build/Android.bp b/sensors/V1_0/build/Android.bp
index 100ac11..9dffc57 100644
--- a/sensors/V1_0/build/Android.bp
+++ b/sensors/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/sensors/V1_0/target/AndroidTest.xml b/sensors/V1_0/target/AndroidTest.xml
index d9ead28..ddec27d 100644
--- a/sensors/V1_0/target/AndroidTest.xml
+++ b/sensors/V1_0/target/AndroidTest.xml
@@ -28,5 +28,6 @@
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.sensors@1.0"/>
<option name="test-timeout" value="15m"/>
+ <option name="runtime-hint" value="5m"/>
</test>
</configuration>
diff --git a/soundtrigger/V2_0/OWNERS b/soundtrigger/V2_0/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/soundtrigger/V2_0/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/soundtrigger/V2_0/build/Android.bp b/soundtrigger/V2_0/build/Android.bp
index 3c9f435..0c4993e 100644
--- a/soundtrigger/V2_0/build/Android.bp
+++ b/soundtrigger/V2_0/build/Android.bp
@@ -75,11 +75,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -134,11 +129,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/tests/Android.bp b/tests/Android.bp
index aa484db..8347b83 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -12,5 +12,6 @@
"libhwbinder/V1_0",
"memory/V1_0",
"msgq/V1_0",
+ "multithread/V1_0",
"pointer/V1_0",
]
diff --git a/tests/extension/light/V2_0/build/Android.bp b/tests/extension/light/V2_0/build/Android.bp
index 542a023..6df2b3d 100644
--- a/tests/extension/light/V2_0/build/Android.bp
+++ b/tests/extension/light/V2_0/build/Android.bp
@@ -72,11 +72,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -129,11 +124,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/tests/multithread/V1_0/Android.bp b/tests/multithread/V1_0/Android.bp
new file mode 100644
index 0000000..995dd5b
--- /dev/null
+++ b/tests/multithread/V1_0/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/thermal/V1_0/build/Android.bp b/thermal/V1_0/build/Android.bp
index aee3411..2e41a71 100644
--- a/thermal/V1_0/build/Android.bp
+++ b/thermal/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/treble/platform_version/VtsTreblePlatformVersionTest.py b/treble/platform_version/VtsTreblePlatformVersionTest.py
index 53130d9..b3404d9 100644
--- a/treble/platform_version/VtsTreblePlatformVersionTest.py
+++ b/treble/platform_version/VtsTreblePlatformVersionTest.py
@@ -82,5 +82,11 @@
except ValueError as e:
asserts.fail("Unexpected value returned from getprop: %s" % e)
+ def testVndkVersion(self):
+ """Test that VNDK version is specified."""
+ vndkVersion = self.getProp("ro.vendor.vndk.version")
+ asserts.assertLess(0, len(vndkVersion),
+ "VNDK version is not defined")
+
if __name__ == "__main__":
test_runner.main()
diff --git a/tv/cec/V1_0/build/Android.bp b/tv/cec/V1_0/build/Android.bp
index 8c4cd99..aade3eb 100644
--- a/tv/cec/V1_0/build/Android.bp
+++ b/tv/cec/V1_0/build/Android.bp
@@ -73,11 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -131,11 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/tv/input/V1_0/build/Android.bp b/tv/input/V1_0/build/Android.bp
index 99edc91..24adb1a 100644
--- a/tv/input/V1_0/build/Android.bp
+++ b/tv/input/V1_0/build/Android.bp
@@ -75,11 +75,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -134,11 +129,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/usb/V1_0/build/Android.bp b/usb/V1_0/build/Android.bp
index 9f7ce78..5042148 100644
--- a/usb/V1_0/build/Android.bp
+++ b/usb/V1_0/build/Android.bp
@@ -73,11 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -131,11 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/usb/V1_1/build/Android.bp b/usb/V1_1/build/Android.bp
index 02ad66c..38ce5cc 100644
--- a/usb/V1_1/build/Android.bp
+++ b/usb/V1_1/build/Android.bp
@@ -75,14 +75,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -137,14 +129,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index cdc8905..2e98897 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -3,4 +3,5 @@
subdirs = [
"V1_0",
+ "V1_1",
]
diff --git a/vibrator/V1_0/build/Android.bp b/vibrator/V1_0/build/Android.bp
index 0ee0a8c..8a334ab 100644
--- a/vibrator/V1_0/build/Android.bp
+++ b/vibrator/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/vibrator/V1_1/Android.bp b/vibrator/V1_1/Android.bp
new file mode 100644
index 0000000..995dd5b
--- /dev/null
+++ b/vibrator/V1_1/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/vibrator/V1_1/build/Android.bp b/vibrator/V1_1/build/Android.bp
new file mode 100644
index 0000000..19b016c
--- /dev/null
+++ b/vibrator/V1_1/build/Android.bp
@@ -0,0 +1,129 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.vibrator@1.1-vts.spec",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts",
+ "android/hardware/vibrator/1.1/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
+ "android/hardware/vibrator/1.1/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.h",
+ "android/hardware/vibrator/1.1/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.vibrator@1.1-vts.driver",
+ generated_sources: ["android.hardware.vibrator@1.1-vts.driver_genc++"],
+ generated_headers: ["android.hardware.vibrator@1.1-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.vibrator@1.1-vts.driver_genc++_headers"],
+ shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libprotobuf-cpp-full",
+ "libutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_drivercomm",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "android.hidl.allocator@1.0",
+ "android.hardware.vibrator@1.1",
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.0-vts.driver",
+ ],
+ export_shared_lib_headers: [
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.0-vts.driver",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
+ "android/hardware/vibrator/1.1/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.h",
+ "android/hardware/vibrator/1.1/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.vibrator@1.1-vts.profiler",
+ generated_sources: ["android.hardware.vibrator@1.1-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.vibrator@1.1-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.vibrator@1.1-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_common",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hardware.vibrator@1.1",
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.0-vts.profiler",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+}
+
diff --git a/vr/V1_0/build/Android.bp b/vr/V1_0/build/Android.bp
index 1497c9c..24da3ab 100644
--- a/vr/V1_0/build/Android.bp
+++ b/vr/V1_0/build/Android.bp
@@ -67,11 +67,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -121,11 +116,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/weaver/V1_0/build/Android.bp b/weaver/V1_0/build/Android.bp
index dd9da7d..3982b93 100644
--- a/weaver/V1_0/build/Android.bp
+++ b/weaver/V1_0/build/Android.bp
@@ -70,11 +70,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -126,11 +121,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/wifi/V1_1/build/Android.bp b/wifi/V1_1/build/Android.bp
index a2bb596..c0cdbd5 100644
--- a/wifi/V1_1/build/Android.bp
+++ b/wifi/V1_1/build/Android.bp
@@ -72,14 +72,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -132,14 +124,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/wifi/offload/V1_0/build/Android.bp b/wifi/offload/V1_0/build/Android.bp
index b5c12f4..7e63e01 100644
--- a/wifi/offload/V1_0/build/Android.bp
+++ b/wifi/offload/V1_0/build/Android.bp
@@ -73,14 +73,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -134,14 +126,6 @@
cflags: [
"-Wall",
"-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}