diff options
author | Chih-hung Hsieh <chh@google.com> | 2017-11-07 00:13:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-07 00:13:21 +0000 |
commit | 16a3e163468f6a6ea96d2aa6a2d8a40e2a8d0c8b (patch) | |
tree | 204168141e85a1b495248dc46b0a37f8ce38a5e7 | |
parent | da154d466fde22d6d45534ef342b71eb20cc2a9f (diff) | |
parent | e27d5eb7339ac12222e60002ca2697d95b23f1c2 (diff) | |
download | native-16a3e163468f6a6ea96d2aa6a2d8a40e2a8d0c8b.tar.gz |
Merge "Use -Werror in frameworks/native/services/vr"
-rw-r--r-- | libs/vr/libdvr/include/dvr/dvr_display_types.h | 2 | ||||
-rw-r--r-- | services/vr/hardware_composer/Android.bp | 23 | ||||
-rw-r--r-- | services/vr/performanced/Android.mk | 1 | ||||
-rw-r--r-- | services/vr/performanced/directory_reader.h | 2 | ||||
-rw-r--r-- | services/vr/virtual_touchpad/Android.bp | 18 | ||||
-rw-r--r-- | services/vr/virtual_touchpad/tests/VirtualTouchpad_test.cpp | 12 |
6 files changed, 42 insertions, 16 deletions
diff --git a/libs/vr/libdvr/include/dvr/dvr_display_types.h b/libs/vr/libdvr/include/dvr/dvr_display_types.h index 25364d8590..fd69843292 100644 --- a/libs/vr/libdvr/include/dvr/dvr_display_types.h +++ b/libs/vr/libdvr/include/dvr/dvr_display_types.h @@ -13,7 +13,7 @@ __BEGIN_DECLS #ifndef __FLOAT32X4T_86 #define __FLOAT32X4T_86 typedef float float32x4_t __attribute__((__vector_size__(16))); -typedef struct float32x4x4_t { float32x4_t val[4]; }; +typedef struct float32x4x4_t { float32x4_t val[4]; } float32x4x4_t; #endif #endif diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp index 920152032a..e92b8d8019 100644 --- a/services/vr/hardware_composer/Android.bp +++ b/services/vr/hardware_composer/Android.bp @@ -44,6 +44,13 @@ cc_library_shared { cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", + // mVrClient unused in vr_composer_client.cpp + "-Wno-error=unused-private-field", + // Warnings in vr_hwc.cpp to be fixed after sync of goog/master. + "-Wno-sign-compare", + "-Wno-unused-parameter", ], } @@ -63,6 +70,11 @@ cc_library_static { }, export_include_dirs: ["aidl"], + cflags: [ + "-Wall", + "-Werror", + ], + shared_libs: [ "libbinder", "libui", @@ -92,6 +104,8 @@ cc_library_static { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", ], } @@ -120,6 +134,8 @@ cc_binary { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", ], init_rc: [ "vr_hwc.rc", @@ -137,6 +153,13 @@ cc_test { // symbols in the *-binder library get optimized out. "libvr_hwc-binder", ], + cflags: [ + "-Wall", + "-Werror", + // warnings in vr_composer_test.cpp to be fixed after merge of goog/master + "-Wno-sign-compare", + "-Wno-unused-parameter", + ], shared_libs: [ "libbase", "libbinder", diff --git a/services/vr/performanced/Android.mk b/services/vr/performanced/Android.mk index dbc66f1cb3..1470234e9e 100644 --- a/services/vr/performanced/Android.mk +++ b/services/vr/performanced/Android.mk @@ -36,6 +36,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(sourceFiles) LOCAL_CFLAGS := -DLOG_TAG=\"performanced\" LOCAL_CFLAGS += -DTRACE=0 +LOCAL_CFLAGS += -Wall -Werror LOCAL_STATIC_LIBRARIES := $(staticLibraries) LOCAL_SHARED_LIBRARIES := $(sharedLibraries) LOCAL_MODULE := performanced diff --git a/services/vr/performanced/directory_reader.h b/services/vr/performanced/directory_reader.h index 7d7ecc5578..b9d27c36f8 100644 --- a/services/vr/performanced/directory_reader.h +++ b/services/vr/performanced/directory_reader.h @@ -19,7 +19,7 @@ class DirectoryReader { directory_ = fdopendir(directory_fd.get()); error_ = errno; if (directory_ != nullptr) - directory_fd.release(); + (void) directory_fd.release(); // ignore return result? } ~DirectoryReader() { diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp index 6b11ce3e25..7196b2bb87 100644 --- a/services/vr/virtual_touchpad/Android.bp +++ b/services/vr/virtual_touchpad/Android.bp @@ -23,7 +23,11 @@ cc_library { shared_libs: shared_libs, header_libs: header_libraries, cppflags: ["-std=c++11"], - cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""], + cflags: [ + "-DLOG_TAG=\"VrVirtualTouchpad\"", + "-Wall", + "-Werror", + ], name: "libvirtualtouchpad", tags: ["optional"], } @@ -44,6 +48,10 @@ cc_test { srcs: test_src_files, static_libs: test_static_libs, header_libs: header_libraries, + cflags = [ + "-Wall", + "-Werror", + ], cppflags = [ "-std=c++11", ], @@ -83,6 +91,8 @@ cc_binary { cppflags: ["-std=c++11"], cflags: [ "-DLOG_TAG=\"VrVirtualTouchpad\"", + "-Wall", + "-Werror", ], host_ldlibs: ["-llog"], name: "virtual_touchpad", @@ -112,7 +122,11 @@ cc_library { shared_libs: client_shared_libs, header_libs: header_libraries, cppflags: ["-std=c++11"], - cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""], + cflags: [ + "-DLOG_TAG=\"VirtualTouchpadClient\"", + "-Wall", + "-Werror", + ], host_ldlibs: ["-llog"], name: "libvirtualtouchpadclient", tags: ["optional"], diff --git a/services/vr/virtual_touchpad/tests/VirtualTouchpad_test.cpp b/services/vr/virtual_touchpad/tests/VirtualTouchpad_test.cpp index b19b018d49..198ed0611b 100644 --- a/services/vr/virtual_touchpad/tests/VirtualTouchpad_test.cpp +++ b/services/vr/virtual_touchpad/tests/VirtualTouchpad_test.cpp @@ -110,17 +110,6 @@ class VirtualTouchpadForTesting : public VirtualTouchpadEvdev { EvdevInjectorForTesting injector[kTouchpads]; }; -void DumpDifference(const char* expect, const char* actual) { - printf(" common: "); - while (*expect && *expect == *actual) { - putchar(*expect); - ++expect; - ++actual; - } - printf("\n expect: %s\n", expect); - printf(" actual: %s\n", actual); -} - } // anonymous namespace class VirtualTouchpadTest : public testing::Test {}; @@ -153,7 +142,6 @@ TEST_F(VirtualTouchpadTest, Goodness) { } const int32_t width = 1 + uidev->absmax[ABS_MT_POSITION_X]; const int32_t height = 1 + uidev->absmax[ABS_MT_POSITION_Y]; - const int32_t slots = uidev->absmax[ABS_MT_SLOT]; for (int t = 0; t < touchpad->GetTouchpadCount(); ++t) { SCOPED_TRACE(t); |