summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2017-10-12 01:18:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-12 01:18:07 +0000
commit8ad1b2872d3b5ddf16b31e37048f4e044faf51e7 (patch)
tree58908a6637795733b05d67de3b2a132e5f6cfb5d /services
parent6261e9737d5285e7763f72632e350a77f35925ba (diff)
parent38a11928990e62b263abe2dada0ff1f43d878e7c (diff)
downloadnative-8ad1b2872d3b5ddf16b31e37048f4e044faf51e7.tar.gz
Merge "Use -Werror in frameworks/native/libs/vr"
Diffstat (limited to 'services')
-rw-r--r--services/vr/hardware_composer/Android.bp16
-rw-r--r--services/vr/virtual_touchpad/Android.bp20
2 files changed, 34 insertions, 2 deletions
diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp
index 5cb201ded3..88a5a611c6 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -43,6 +43,11 @@ cc_library_shared {
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
+ "-Wall",
+ "-Werror",
+ "-Wno-error=sign-compare", // fix later
+ "-Wno-unused-private-field",
+ "-Wno-unused-parameter",
],
}
@@ -56,6 +61,7 @@ cc_library_static {
"aidl/android/dvr/parcelable_composer_layer.cpp",
"aidl/android/dvr/parcelable_unique_fd.cpp",
],
+ cflags: ["-Wall", "-Werror"],
aidl: {
include_dirs: ["frameworks/native/services/vr/hardware_composer/aidl"],
export_aidl_headers: true,
@@ -91,6 +97,8 @@ cc_library_static {
],
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
+ "-Wall",
+ "-Werror",
],
}
@@ -119,6 +127,8 @@ cc_binary {
],
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
+ "-Wall",
+ "-Werror",
],
init_rc: [
"vr_hwc.rc",
@@ -129,6 +139,12 @@ cc_test {
name: "vr_hwc_test",
gtest: true,
srcs: ["tests/vr_composer_test.cpp"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-error=sign-compare", // fix later
+ "-Wno-unused-parameter",
+ ],
static_libs: [
"libgtest",
"libvr_hwc-impl",
diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp
index 3d5dfb271a..919d12423c 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -18,7 +18,11 @@ cc_library {
export_include_dirs: ["include"],
shared_libs: shared_libs,
cppflags: ["-std=c++11"],
- cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""],
+ cflags: [
+ "-DLOG_TAG=\"VrVirtualTouchpad\"",
+ "-Wall",
+ "-Werror",
+ ],
name: "libvirtualtouchpad",
tags: ["optional"],
}
@@ -51,6 +55,12 @@ cc_test {
name: "VirtualTouchpad_test",
stl: "libc++_static",
tags: [ "optional" ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-unused-function",
+ "-Wno-unused-variable",
+ ],
}
// Service.
@@ -80,6 +90,8 @@ cc_binary {
cppflags: ["-std=c++11"],
cflags: [
"-DLOG_TAG=\"VrVirtualTouchpad\"",
+ "-Wall",
+ "-Werror",
],
host_ldlibs: ["-llog"],
name: "virtual_touchpad",
@@ -108,7 +120,11 @@ cc_library {
srcs: client_src,
shared_libs: client_shared_libs,
cppflags: ["-std=c++11"],
- cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""],
+ cflags: [
+ "-DLOG_TAG=\"VirtualTouchpadClient\"",
+ "-Wall",
+ "-Werror",
+ ],
host_ldlibs: ["-llog"],
name: "libvirtualtouchpadclient",
tags: ["optional"],