diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-10-12 01:32:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-12 01:32:33 +0000 |
| commit | 37e64c30afae2bcf1a0a5fc54cca8a392a33421e (patch) | |
| tree | dc3ebb79e6cc7573e8af32de97dd6f7e9088b2d3 /services | |
| parent | 05f5697b419d289d3ec134d670dfea4b0a47155b (diff) | |
| parent | 8ad1b2872d3b5ddf16b31e37048f4e044faf51e7 (diff) | |
| download | native-37e64c30afae2bcf1a0a5fc54cca8a392a33421e.tar.gz | |
Merge "Use -Werror in frameworks/native/libs/vr"
am: 8ad1b2872d
Change-Id: I6b259336b1ecfa2564f4c2c2de9a5734a8666342
Diffstat (limited to 'services')
| -rw-r--r-- | services/vr/hardware_composer/Android.bp | 16 | ||||
| -rw-r--r-- | services/vr/virtual_touchpad/Android.bp | 20 |
2 files changed, 34 insertions, 2 deletions
diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp index 920152032a..d5944e0908 100644 --- a/services/vr/hardware_composer/Android.bp +++ b/services/vr/hardware_composer/Android.bp @@ -44,6 +44,11 @@ cc_library_shared { cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", + "-Wno-error=sign-compare", // fix later + "-Wno-unused-private-field", + "-Wno-unused-parameter", ], } @@ -57,6 +62,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, @@ -92,6 +98,8 @@ cc_library_static { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", ], } @@ -120,6 +128,8 @@ cc_binary { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", + "-Wall", + "-Werror", ], init_rc: [ "vr_hwc.rc", @@ -130,6 +140,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 6b11ce3e25..3e2e40f72a 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"], } @@ -53,6 +57,12 @@ cc_test { name: "VirtualTouchpad_test", stl: "libc++_static", tags: [ "optional" ], + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-function", + "-Wno-unused-variable", + ], } // Service. @@ -83,6 +93,8 @@ cc_binary { cppflags: ["-std=c++11"], cflags: [ "-DLOG_TAG=\"VrVirtualTouchpad\"", + "-Wall", + "-Werror", ], host_ldlibs: ["-llog"], name: "virtual_touchpad", @@ -112,7 +124,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"], |