Merge "Convert boot, memtrack and power hal to use service name aware testing."
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/CleanSpec.mk b/CleanSpec.mk
index 42399a6..cad545c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -56,3 +56,4 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)
$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)
$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator*)
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index 621853c..70fa750 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -30,6 +30,8 @@
StreamIn.cpp \
StreamOut.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \
@@ -65,6 +67,8 @@
LOCAL_SRC_FILES := \
service.cpp
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
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 b81cbb9..3ed55a3 100644
--- a/audio/2.0/default/StreamIn.cpp
+++ b/audio/2.0/default/StreamIn.cpp
@@ -87,7 +87,6 @@
}
ssize_t readResult = mStream->read(mStream, &mBuffer[0], requestedToRead);
mStatus.retval = Result::OK;
- uint64_t read = 0;
if (readResult >= 0) {
mStatus.reply.read = readResult;
if (!mDataMQ->write(&mBuffer[0], readResult)) {
@@ -326,7 +325,7 @@
ThreadInfo threadInfo = {0, 0};
// Wrap the _hidl_cb to return an error
- auto sendError = [this, &threadInfo, &_hidl_cb](Result result) {
+ auto sendError = [&threadInfo, &_hidl_cb](Result result) {
_hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),
StatusMQ::Descriptor(), threadInfo);
@@ -420,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/default/StreamOut.cpp b/audio/2.0/default/StreamOut.cpp
index 290d0b1..242e8fc 100644
--- a/audio/2.0/default/StreamOut.cpp
+++ b/audio/2.0/default/StreamOut.cpp
@@ -302,7 +302,7 @@
ThreadInfo threadInfo = {0, 0};
// Wrap the _hidl_cb to return an error
- auto sendError = [this, &threadInfo, &_hidl_cb](Result result) {
+ auto sendError = [&threadInfo, &_hidl_cb](Result result) {
_hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),
StatusMQ::Descriptor(), threadInfo);
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/Android.bp b/audio/effect/2.0/default/Android.bp
index 79bb8b0..e1072b4 100644
--- a/audio/effect/2.0/default/Android.bp
+++ b/audio/effect/2.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.audio.effect@2.0-impl",
+ defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
srcs: [
diff --git a/audio/effect/2.0/default/Effect.cpp b/audio/effect/2.0/default/Effect.cpp
index 2d36604..184607e 100644
--- a/audio/effect/2.0/default/Effect.cpp
+++ b/audio/effect/2.0/default/Effect.cpp
@@ -610,10 +610,8 @@
}
Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) {
- uint32_t halCmd = EFFECT_FEATURE_AUX_CHANNELS;
uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];
memset(halResult, 0, sizeof(halResult));
- uint32_t halResultSize = 0;
EffectAuxChannelsConfig result;
Result retval = getCurrentConfigImpl(
EFFECT_FEATURE_AUX_CHANNELS,
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/automotive/evs/1.0/default/Android.mk b/automotive/evs/1.0/default/Android.mk
index 0ee7071..28abe6c 100644
--- a/automotive/evs/1.0/default/Android.mk
+++ b/automotive/evs/1.0/default/Android.mk
@@ -24,6 +24,6 @@
liblog \
libutils \
-LOCAL_CFLAGS := -O0 -g
+LOCAL_CFLAGS := -O0 -g -Wall -Werror
include $(BUILD_EXECUTABLE)
diff --git a/automotive/vehicle/2.0/default/Android.mk b/automotive/vehicle/2.0/default/Android.mk
index 72e1364..141cda6 100644
--- a/automotive/vehicle/2.0/default/Android.mk
+++ b/automotive/vehicle/2.0/default/Android.mk
@@ -28,6 +28,8 @@
common/src/VehiclePropertyStore.cpp \
common/src/VehicleUtils.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/common/include/vhal_v2_0
@@ -53,6 +55,8 @@
common/src/VehiclePropertyStore.cpp \
common/src/VehicleUtils.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/common/include/vhal_v2_0
@@ -87,6 +91,8 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(generated_sources_dir)/proto/$(LOCAL_PATH)/impl/vhal_v2_0/proto
+LOCAL_CFLAGS += -Wall -Wextra -Werror
+
include $(BUILD_STATIC_LIBRARY)
diff --git a/automotive/vehicle/2.1/default/Android.mk b/automotive/vehicle/2.1/default/Android.mk
index f19263c..f6efc0e 100644
--- a/automotive/vehicle/2.1/default/Android.mk
+++ b/automotive/vehicle/2.1/default/Android.mk
@@ -25,6 +25,8 @@
LOCAL_SRC_FILES := \
common/src/Obd2SensorStore.cpp
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/common/include/vhal_v2_1 \
$(LOCAL_PATH)/../../2.0/default/common/include/vhal_v2_0 \
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/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp
index 63e7562..48bbadf 100644
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -115,6 +115,7 @@
cc_binary {
name: "android.hardware.bluetooth@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.bluetooth@1.0-service.rc"],
diff --git a/bluetooth/1.0/default/test/bluetooth_address_test.cc b/bluetooth/1.0/default/test/bluetooth_address_test.cc
index e60729e..2c8dbe5 100644
--- a/bluetooth/1.0/default/test/bluetooth_address_test.cc
+++ b/bluetooth/1.0/default/test/bluetooth_address_test.cc
@@ -56,7 +56,7 @@
void BluetoothAddressTest::FileWriteString(const char* path,
const char* string) {
- int fd = open(path, O_CREAT | O_RDWR);
+ int fd = open(path, O_CREAT | O_RDWR, 0600);
EXPECT_TRUE(fd > 0) << "err = " << strerror(errno);
size_t length = strlen(string);
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/1.0/default/Android.bp b/boot/1.0/default/Android.bp
index c9b7492..6cfbf32 100644
--- a/boot/1.0/default/Android.bp
+++ b/boot/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.boot@1.0-impl",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
srcs: ["BootControl.cpp"],
@@ -17,6 +18,7 @@
cc_binary {
name: "android.hardware.boot@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.boot@1.0-service.rc"],
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/compatibility_matrix.current.xml b/compatibility_matrix.current.xml
index 9603bd6..016bdf8 100644
--- a/compatibility_matrix.current.xml
+++ b/compatibility_matrix.current.xml
@@ -228,14 +228,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>android.hardware.radio.deprecated</name>
- <version>1.0</version>
- <interface>
- <name>IOemHook</name>
- <instance>slot1</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>android.hardware.renderscript</name>
<version>1.0</version>
<interface>
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/1.0/default/Android.bp b/gatekeeper/1.0/default/Android.bp
index 4e6c9f0..ae3b91c 100644
--- a/gatekeeper/1.0/default/Android.bp
+++ b/gatekeeper/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.gatekeeper@1.0-impl",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
@@ -18,6 +19,7 @@
cc_binary {
name: "android.hardware.gatekeeper@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.gatekeeper@1.0-service.rc"],
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/1.0/default/Android.bp b/gnss/1.0/default/Android.bp
index 007ed97..ca495e6 100644
--- a/gnss/1.0/default/Android.bp
+++ b/gnss/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.gnss@1.0-impl",
+ defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
srcs: [
@@ -27,14 +28,13 @@
"libhardware",
],
- cflags: ["-Werror"],
-
}
cc_binary {
relative_install_path: "hw",
vendor: true,
name: "android.hardware.gnss@1.0-service",
+ defaults: ["hidl_defaults"],
init_rc: ["android.hardware.gnss@1.0-service.rc"],
srcs: ["service.cpp"],
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/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 0b0722e..50b474e 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -5,7 +5,6 @@
root: "android.hardware",
vndk: {
enabled: true,
- support_system_process: true,
},
srcs: [
"IAllocator.hal",
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/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
index 78353ea..9e7c9f6 100644
--- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -2762,7 +2762,8 @@
Begin(KeyPurpose::ENCRYPT,
AuthorizationSetBuilder().Padding(PaddingMode::RSA_OAEP).Digest(Digest::SHA1)));
string result;
- EXPECT_EQ(ErrorCode::INVALID_INPUT_LENGTH, Finish(message, &result));
+ auto error = Finish(message, &result);
+ EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);
EXPECT_EQ(0U, result.size());
}
@@ -2820,7 +2821,8 @@
auto params = AuthorizationSetBuilder().Padding(PaddingMode::RSA_PKCS1_1_5_ENCRYPT);
EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::ENCRYPT, params));
string result;
- EXPECT_EQ(ErrorCode::INVALID_INPUT_LENGTH, Finish(message, &result));
+ auto error = Finish(message, &result);
+ EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);
EXPECT_EQ(0U, result.size());
}
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/2.0/default/Android.mk b/light/2.0/default/Android.mk
index 1f44e66..da75e1a 100644
--- a/light/2.0/default/Android.mk
+++ b/light/2.0/default/Android.mk
@@ -7,6 +7,8 @@
LOCAL_SRC_FILES := \
Light.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
@@ -28,6 +30,8 @@
LOCAL_SRC_FILES := \
service.cpp \
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \
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/Android.mk b/soundtrigger/2.0/default/Android.mk
index 068c6b4..9262858 100644
--- a/soundtrigger/2.0/default/Android.mk
+++ b/soundtrigger/2.0/default/Android.mk
@@ -23,6 +23,8 @@
LOCAL_SRC_FILES := \
SoundTriggerHalImpl.cpp
+LOCAL_CFLAGS := -Wall -Werror
+
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
libhidltransport \
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/expression/1.0/IExpressionExt.hal b/tests/expression/1.0/IExpressionExt.hal
index e96bf0d..8b56ec6 100644
--- a/tests/expression/1.0/IExpressionExt.hal
+++ b/tests/expression/1.0/IExpressionExt.hal
@@ -26,7 +26,9 @@
ENUM_BEST = android.hardware.tests.expression@1.0::IExpression.Constants:CONST_BAR,
};
- typedef Color[((Constants:MAX_ARRAY_SIZE << 1) - (Constants:CONST_FOO + 1)*8) >> 1] SixteenColors;
+ typedef Constants AlsoConstants;
+
+ typedef Color[((Constants:MAX_ARRAY_SIZE << 1) - (AlsoConstants:CONST_FOO + 1)*8) >> 1] SixteenColors;
struct ArrayOfColors {
Color[(Constants:MAX_ARRAY_SIZE << 1) - (Constants:CONST_FOO + 1)*8] my32Colors; // 32
};
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/tests/foo/1.0/types.hal b/tests/foo/1.0/types.hal
index 6b4b697..b358a93 100644
--- a/tests/foo/1.0/types.hal
+++ b/tests/foo/1.0/types.hal
@@ -38,3 +38,30 @@
struct Unrelated {
Outer.Inner great;
};
+
+// structs to test enum iterators in hidl_test
+struct EnumIterators {
+ enum Empty : uint32_t {};
+
+ enum Parent : uint32_t {
+ A,
+ };
+ enum EmptyChild : Parent {};
+ enum Grandchild : EmptyChild {
+ B,
+ };
+
+ enum SkipsValues : uint32_t {
+ A = 7,
+ B,
+ C = 100,
+ D,
+ E
+ };
+ enum MultipleValues : uint32_t {
+ A = 7,
+ B = 7,
+ C = 8,
+ D = 7,
+ };
+};
\ No newline at end of file
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index cd97fe4..5038664 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -7,6 +7,8 @@
"IMemoryTest.hal",
],
interfaces: [
+ "android.hidl.memory.token@1.0",
+ "android.hidl.memory.block@1.0",
"android.hidl.base@1.0",
],
gen_java: false,
diff --git a/tests/memory/1.0/IMemoryTest.hal b/tests/memory/1.0/IMemoryTest.hal
index 4d6de3f..b20859c 100644
--- a/tests/memory/1.0/IMemoryTest.hal
+++ b/tests/memory/1.0/IMemoryTest.hal
@@ -16,7 +16,13 @@
package android.hardware.tests.memory@1.0;
+import android.hidl.memory.token@1.0::IMemoryToken;
+import android.hidl.memory.block@1.0::MemoryBlock;
+
interface IMemoryTest {
haveSomeMemory(memory mem) generates(memory mem);
fillMemory(memory memory_in, uint8_t filler);
+ haveSomeMemoryBlock(MemoryBlock blk) generates(MemoryBlock blk);
+ set(memory mem) generates();
+ get()generates(IMemoryToken token);
};
diff --git a/tests/memory/1.0/default/Android.bp b/tests/memory/1.0/default/Android.bp
index 985183b..3f13634 100644
--- a/tests/memory/1.0/default/Android.bp
+++ b/tests/memory/1.0/default/Android.bp
@@ -28,6 +28,7 @@
"liblog",
"libutils",
"android.hidl.memory@1.0",
+ "android.hidl.memory.token@1.0",
],
// These are static libs only for testing purposes and portability. Shared
diff --git a/tests/memory/1.0/default/MemoryTest.cpp b/tests/memory/1.0/default/MemoryTest.cpp
index 37a2a60..5cbf67e 100644
--- a/tests/memory/1.0/default/MemoryTest.cpp
+++ b/tests/memory/1.0/default/MemoryTest.cpp
@@ -20,6 +20,7 @@
#include <log/log.h>
+#include <hidlmemory/HidlMemoryToken.h>
#include <hidlmemory/mapping.h>
#include <android/hidl/memory/1.0/IMemory.h>
@@ -60,6 +61,22 @@
return Void();
}
+Return<void> Memory::haveSomeMemoryBlock(const MemoryBlock& blk, haveSomeMemoryBlock_cb _hidl_cb) {
+ _hidl_cb(blk);
+ return Void();
+}
+
+Return<void> Memory::set(const hidl_memory& mem) {
+ sp<HidlMemory> hidlMem = HidlMemory::getInstance(mem);
+ if (hidlMem->valid()) {
+ mSavedMemoryToken = new HidlMemoryToken(hidlMem);
+ }
+ return Void();
+}
+
+Return<sp<IMemoryToken>> Memory::get() {
+ return mSavedMemoryToken;
+}
IMemoryTest* HIDL_FETCH_IMemoryTest(const char* /* name */) {
return new Memory();
diff --git a/tests/memory/1.0/default/MemoryTest.h b/tests/memory/1.0/default/MemoryTest.h
index 0d903f1..4c2ed36 100644
--- a/tests/memory/1.0/default/MemoryTest.h
+++ b/tests/memory/1.0/default/MemoryTest.h
@@ -20,6 +20,7 @@
#include <android/hardware/tests/memory/1.0/IMemoryTest.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
+#include <hidlmemory/HidlMemoryToken.h>
namespace android {
namespace hardware {
@@ -28,14 +29,17 @@
namespace V1_0 {
namespace implementation {
-using ::android::hardware::tests::memory::V1_0::IMemoryTest;
+using ::android::sp;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
+using ::android::hardware::HidlMemoryToken;
using ::android::hardware::Return;
using ::android::hardware::Void;
-using ::android::sp;
+using ::android::hardware::tests::memory::V1_0::IMemoryTest;
+using ::android::hidl::memory::block::V1_0::MemoryBlock;
+using ::android::hidl::memory::token::V1_0::IMemoryToken;
struct Memory : public IMemoryTest {
// Methods from ::android::hardware::tests::memory::V1_0::IMemoryTest follow.
@@ -43,6 +47,14 @@
Return<void> fillMemory(const hidl_memory& memory_in, uint8_t filler) override;
+ Return<void> haveSomeMemoryBlock(const MemoryBlock& blk,
+ haveSomeMemoryBlock_cb _hidl_cb) override;
+ Return<void> set(const ::android::hardware::hidl_memory& mem) override;
+
+ Return<sp<IMemoryToken>> get() override;
+
+ protected:
+ sp<HidlMemoryToken> mSavedMemoryToken;
};
extern "C" IMemoryTest* HIDL_FETCH_IMemoryTest(const char* name);
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/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 2054b88..9d81474 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -34,6 +34,7 @@
cc_binary {
name: "android.hardware.thermal@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.thermal@1.0-service.rc"],
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/tv/cec/1.0/default/Android.bp b/tv/cec/1.0/default/Android.bp
index efb88ec..069f327 100644
--- a/tv/cec/1.0/default/Android.bp
+++ b/tv/cec/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.tv.cec@1.0-impl",
+ defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
srcs: ["HdmiCec.cpp"],
@@ -18,6 +19,7 @@
cc_binary {
name: "android.hardware.tv.cec@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.tv.cec@1.0-service.rc"],
diff --git a/tv/input/1.0/default/Android.bp b/tv/input/1.0/default/Android.bp
index f8956f1..7c140a5 100644
--- a/tv/input/1.0/default/Android.bp
+++ b/tv/input/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.tv.input@1.0-impl",
+ defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
srcs: ["TvInput.cpp"],
@@ -19,6 +20,7 @@
cc_binary {
name: "android.hardware.tv.input@1.0-service",
+ defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
init_rc: ["android.hardware.tv.input@1.0-service.rc"],
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",
-]