Merge "Use -Werror in hardware/interfaces/automotive/vehicle/2.0"
diff --git a/Android.bp b/Android.bp
index 978559a..5cb85b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,3 @@
-subdirs = [
- "*"
-]
-
hidl_package_root {
name: "android.hardware",
path: "hardware/interfaces",
diff --git a/audio/2.0/default/OWNERS b/audio/2.0/default/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/2.0/default/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/2.0/default/StreamIn.cpp b/audio/2.0/default/StreamIn.cpp
index 575a4f4..3ed55a3 100644
--- a/audio/2.0/default/StreamIn.cpp
+++ b/audio/2.0/default/StreamIn.cpp
@@ -419,7 +419,7 @@
// spam the log in this case.
static const std::vector<int> ignoredErrors{ENOSYS};
Result retval(Result::NOT_SUPPORTED);
- if (stream->get_capture_position != NULL) return retval;
+ if (stream->get_capture_position == NULL) return retval;
int64_t halFrames, halTime;
retval = Stream::analyzeStatus("get_capture_position",
stream->get_capture_position(stream, &halFrames, &halTime),
diff --git a/audio/2.0/vts/OWNERS b/audio/2.0/vts/OWNERS
new file mode 100644
index 0000000..8711a9f
--- /dev/null
+++ b/audio/2.0/vts/OWNERS
@@ -0,0 +1,5 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+yim@google.com
+zhuoyao@google.com
\ No newline at end of file
diff --git a/audio/Android.bp b/audio/Android.bp
deleted file mode 100644
index f4a5846..0000000
--- a/audio/Android.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "2.0",
- "2.0/vts/functional",
- "common/2.0",
- "common/2.0/default",
- "common/test/utility",
- "effect/2.0",
- "effect/2.0/default",
- "effect/2.0/vts/functional",
-]
diff --git a/audio/common/2.0/default/OWNERS b/audio/common/2.0/default/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/common/2.0/default/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/common/test/OWNERS b/audio/common/test/OWNERS
new file mode 100644
index 0000000..8711a9f
--- /dev/null
+++ b/audio/common/test/OWNERS
@@ -0,0 +1,5 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+yim@google.com
+zhuoyao@google.com
\ No newline at end of file
diff --git a/audio/common/test/utility/OWNERS b/audio/common/test/utility/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/common/test/utility/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/effect/2.0/default/OWNERS b/audio/effect/2.0/default/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/effect/2.0/default/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/effect/2.0/vts/OWNERS b/audio/effect/2.0/vts/OWNERS
new file mode 100644
index 0000000..8711a9f
--- /dev/null
+++ b/audio/effect/2.0/vts/OWNERS
@@ -0,0 +1,5 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+yim@google.com
+zhuoyao@google.com
\ No newline at end of file
diff --git a/automotive/Android.bp b/automotive/Android.bp
deleted file mode 100644
index be58829..0000000
--- a/automotive/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "evs/1.0",
- "evs/1.0/vts/functional",
- "vehicle/2.0",
- "vehicle/2.1",
-]
diff --git a/biometrics/Android.bp b/biometrics/Android.bp
deleted file mode 100644
index 19a1062..0000000
--- a/biometrics/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "fingerprint/2.1",
- "fingerprint/2.1/default",
- "fingerprint/2.1/vts/functional",
-]
diff --git a/biometrics/fingerprint/2.1/default/Android.bp b/biometrics/fingerprint/2.1/default/Android.bp
index e1d2cf7..b12ce61 100644
--- a/biometrics/fingerprint/2.1/default/Android.bp
+++ b/biometrics/fingerprint/2.1/default/Android.bp
@@ -1,5 +1,6 @@
cc_binary {
name: "android.hardware.biometrics.fingerprint@2.1-service",
+ defaults: ["hidl_defaults"],
init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rc"],
vendor: true,
relative_install_path: "hw",
diff --git a/biometrics/fingerprint/2.1/default/service.cpp b/biometrics/fingerprint/2.1/default/service.cpp
index 1697c07..edfaac4 100644
--- a/biometrics/fingerprint/2.1/default/service.cpp
+++ b/biometrics/fingerprint/2.1/default/service.cpp
@@ -35,7 +35,9 @@
configureRpcThreadpool(1, true /*callerWillJoin*/);
if (bio != nullptr) {
- bio->registerAsService();
+ if (::android::OK != bio->registerAsService()) {
+ return 1;
+ }
} else {
ALOGE("Can't create instance of BiometricsFingerprint, nullptr");
}
diff --git a/bluetooth/Android.bp b/bluetooth/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/bluetooth/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/boot/Android.bp b/boot/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/boot/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/broadcastradio/1.0/default/OWNERS b/broadcastradio/1.0/default/OWNERS
new file mode 100644
index 0000000..b159083
--- /dev/null
+++ b/broadcastradio/1.0/default/OWNERS
@@ -0,0 +1,4 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+twasilczyk@google.com
diff --git a/broadcastradio/Android.bp b/broadcastradio/Android.bp
deleted file mode 100644
index 7a315fa..0000000
--- a/broadcastradio/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
- "1.1",
- "1.1/default",
- "1.1/vts/functional",
-]
diff --git a/camera/Android.bp b/camera/Android.bp
deleted file mode 100644
index 3869766..0000000
--- a/camera/Android.bp
+++ /dev/null
@@ -1,13 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "common/1.0",
- "common/1.0/default",
- "device/1.0",
- "device/1.0/default",
- "device/3.2",
- "device/3.2/default",
- "metadata/3.2",
- "provider/2.4",
- "provider/2.4/default",
- "provider/2.4/vts/functional",
-]
diff --git a/configstore/Android.bp b/configstore/Android.bp
deleted file mode 100644
index 4a783c3..0000000
--- a/configstore/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
- "1.1",
- "1.1/vts/functional",
- "utils",
-]
diff --git a/contexthub/Android.bp b/contexthub/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/contexthub/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/drm/Android.bp b/drm/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/drm/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/dumpstate/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/gatekeeper/Android.bp b/gatekeeper/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/gatekeeper/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/gnss/Android.bp b/gnss/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/gnss/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/graphics/Android.bp b/graphics/Android.bp
deleted file mode 100644
index 9aea85f..0000000
--- a/graphics/Android.bp
+++ /dev/null
@@ -1,13 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "allocator/2.0",
- "allocator/2.0/default",
- "bufferqueue/1.0",
- "common/1.0",
- "composer/2.1",
- "composer/2.1/default",
- "composer/2.1/vts/functional",
- "mapper/2.0",
- "mapper/2.0/default",
- "mapper/2.0/vts/functional",
-]
diff --git a/health/Android.bp b/health/Android.bp
deleted file mode 100644
index 31e042a..0000000
--- a/health/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
- "2.0",
-]
diff --git a/ir/Android.bp b/ir/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/ir/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/keymaster/Android.bp b/keymaster/Android.bp
deleted file mode 100644
index 09b8cb2..0000000
--- a/keymaster/Android.bp
+++ /dev/null
@@ -1,4 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "3.0",
-]
diff --git a/light/Android.bp b/light/Android.bp
deleted file mode 100644
index 8d2c986..0000000
--- a/light/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "2.0",
- "2.0/vts/functional",
-]
diff --git a/media/Android.bp b/media/Android.bp
deleted file mode 100644
index 53e82bd..0000000
--- a/media/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "omx/1.0",
- "omx/1.0/vts/functional/audio",
- "omx/1.0/vts/functional/common",
- "omx/1.0/vts/functional/component",
- "omx/1.0/vts/functional/master",
- "omx/1.0/vts/functional/video",
-]
diff --git a/memtrack/Android.bp b/memtrack/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/memtrack/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/nfc/Android.bp b/nfc/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/nfc/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/oemlock/Android.bp b/oemlock/Android.bp
deleted file mode 100644
index 33f70eb..0000000
--- a/oemlock/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
-]
diff --git a/power/Android.bp b/power/Android.bp
deleted file mode 100644
index 7a315fa..0000000
--- a/power/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
- "1.1",
- "1.1/default",
- "1.1/vts/functional",
-]
diff --git a/radio/Android.bp b/radio/Android.bp
deleted file mode 100644
index 758de07..0000000
--- a/radio/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
- "1.1",
- "1.1/vts/functional",
- "1.2",
- "1.2/vts/functional",
- "deprecated/1.0",
-]
diff --git a/renderscript/Android.bp b/renderscript/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/renderscript/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/sensors/Android.bp b/sensors/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/sensors/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/soundtrigger/2.0/default/OWNERS b/soundtrigger/2.0/default/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/soundtrigger/2.0/default/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/soundtrigger/Android.bp b/soundtrigger/Android.bp
deleted file mode 100644
index 8d2c986..0000000
--- a/soundtrigger/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "2.0",
- "2.0/vts/functional",
-]
diff --git a/tests/Android.bp b/tests/Android.bp
deleted file mode 100644
index 0031637..0000000
--- a/tests/Android.bp
+++ /dev/null
@@ -1,31 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "bar/1.0",
- "bar/1.0/default",
- "baz/1.0",
- "baz/1.0/default",
- "expression/1.0",
- "extension/light/2.0",
- "extension/light/2.0/default",
- "foo/1.0",
- "foo/1.0/default",
- "foo/1.0/default/lib",
- "hash/1.0",
- "hash/1.0/default",
- "inheritance/1.0",
- "inheritance/1.0/default",
- "libhwbinder/1.0",
- "libhwbinder/1.0/default",
- "libhwbinder/aidl",
- "memory/1.0",
- "memory/1.0/default",
- "msgq/1.0",
- "msgq/1.0/default",
- "multithread/1.0",
- "multithread/1.0/default",
- "pointer/1.0",
- "pointer/1.0/default",
- "pointer/1.0/default/lib",
- "trie/1.0",
- "trie/1.0/default",
-]
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 986115c..769de2d 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -17,6 +17,7 @@
types: [
"Abc",
"Def",
+ "EnumIterators",
"Outer",
"Unrelated",
],
diff --git a/tetheroffload/Android.bp b/tetheroffload/Android.bp
deleted file mode 100644
index f3c7021..0000000
--- a/tetheroffload/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "config/1.0",
- "config/1.0/vts/functional",
- "control/1.0",
- "control/1.0/vts/functional",
-]
diff --git a/thermal/Android.bp b/thermal/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/thermal/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/tv/Android.bp b/tv/Android.bp
deleted file mode 100644
index 58d840e..0000000
--- a/tv/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "cec/1.0",
- "cec/1.0/default",
- "input/1.0",
- "input/1.0/default",
- "input/1.0/vts/functional",
-]
diff --git a/usb/1.0/default/OWNERS b/usb/1.0/default/OWNERS
new file mode 100644
index 0000000..fefae56
--- /dev/null
+++ b/usb/1.0/default/OWNERS
@@ -0,0 +1 @@
+badhri@google.com
diff --git a/usb/1.0/vts/OWNERS b/usb/1.0/vts/OWNERS
new file mode 100644
index 0000000..54f268f
--- /dev/null
+++ b/usb/1.0/vts/OWNERS
@@ -0,0 +1,3 @@
+badhri@google.com
+yim@google.com
+trong@google.com
diff --git a/usb/1.1/vts/OWNERS b/usb/1.1/vts/OWNERS
new file mode 100644
index 0000000..54f268f
--- /dev/null
+++ b/usb/1.1/vts/OWNERS
@@ -0,0 +1,3 @@
+badhri@google.com
+yim@google.com
+trong@google.com
diff --git a/usb/Android.bp b/usb/Android.bp
deleted file mode 100644
index a5415df..0000000
--- a/usb/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
- "1.1",
- "1.1/vts/functional",
-]
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
deleted file mode 100644
index a5415df..0000000
--- a/vibrator/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
- "1.1",
- "1.1/vts/functional",
-]
diff --git a/vr/Android.bp b/vr/Android.bp
deleted file mode 100644
index ed19a37..0000000
--- a/vr/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/default",
- "1.0/vts/functional",
-]
diff --git a/weaver/Android.bp b/weaver/Android.bp
deleted file mode 100644
index 33f70eb..0000000
--- a/weaver/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
-]
diff --git a/wifi/Android.bp b/wifi/Android.bp
deleted file mode 100644
index b4ab98f..0000000
--- a/wifi/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
- "1.0",
- "1.0/vts/functional",
- "1.1",
- "1.1/vts/functional",
- "offload/1.0",
- "offload/1.0/vts/functional",
- "supplicant/1.0",
-]
