diff options
author | Chih-hung Hsieh <chh@google.com> | 2017-10-12 02:46:39 +0000 |
---|---|---|
committer | Chih-hung Hsieh <chh@google.com> | 2017-10-12 02:46:39 +0000 |
commit | d980f7a91d54da257a0b2d94a2d70263d11229e9 (patch) | |
tree | 4a7e49f1b4917ff460837b8406c7ac56c3552730 | |
parent | 38a11928990e62b263abe2dada0ff1f43d878e7c (diff) | |
download | native-d980f7a91d54da257a0b2d94a2d70263d11229e9.tar.gz |
Revert "Use -Werror in frameworks/native/libs/vr"
This reverts commit 38a11928990e62b263abe2dada0ff1f43d878e7c.
Change-Id: I2315300d0c8d52e224907a4f8edcf0d53658a742
-rw-r--r-- | libs/vr/libbufferhub/Android.bp | 8 | ||||
-rw-r--r-- | libs/vr/libbufferhubqueue/Android.bp | 5 | ||||
-rw-r--r-- | libs/vr/libbufferhubqueue/tests/Android.bp | 6 | ||||
-rw-r--r-- | libs/vr/libdisplay/Android.bp | 2 | ||||
-rw-r--r-- | libs/vr/libdisplay/include/dvr/dvr_display_types.h | 2 | ||||
-rw-r--r-- | libs/vr/libdvr/Android.bp | 2 | ||||
-rw-r--r-- | libs/vr/libdvr/tests/Android.bp | 5 | ||||
-rw-r--r-- | libs/vr/libdvrcommon/Android.bp | 7 | ||||
-rw-r--r-- | libs/vr/libperformance/Android.bp | 4 | ||||
-rw-r--r-- | libs/vr/libvrflinger/Android.bp | 4 | ||||
-rw-r--r-- | libs/vr/libvrsensor/Android.bp | 4 | ||||
-rw-r--r-- | libs/vr/libvrsensor/include/dvr/pose_client.h | 2 | ||||
-rw-r--r-- | services/vr/hardware_composer/Android.bp | 16 | ||||
-rw-r--r-- | services/vr/virtual_touchpad/Android.bp | 20 |
14 files changed, 5 insertions, 82 deletions
diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp index 2819fe92a1..17725f85a8 100644 --- a/libs/vr/libbufferhub/Android.bp +++ b/libs/vr/libbufferhub/Android.bp @@ -42,9 +42,6 @@ cc_library { "-DLOG_TAG=\"libbufferhub\"", "-DTRACE=0", "-DATRACE_TAG=ATRACE_TAG_GRAPHICS", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later ], export_include_dirs: localIncludeFiles, static_libs: staticLibraries, @@ -58,10 +55,5 @@ cc_test { static_libs: ["libbufferhub"] + staticLibraries, shared_libs: sharedLibraries, name: "bufferhub_tests", - cflags: [ - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later - ], } diff --git a/libs/vr/libbufferhubqueue/Android.bp b/libs/vr/libbufferhubqueue/Android.bp index efd5cc79df..a7c33ee3fb 100644 --- a/libs/vr/libbufferhubqueue/Android.bp +++ b/libs/vr/libbufferhubqueue/Android.bp @@ -48,11 +48,6 @@ cc_library { "-DLOG_TAG=\"libbufferhubqueue\"", "-DTRACE=0", "-DATRACE_TAG=ATRACE_TAG_GRAPHICS", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later - "-Wno-unused-parameter", - "-Wno-unused-variable", ], srcs: sourceFiles, export_include_dirs: includeFiles, diff --git a/libs/vr/libbufferhubqueue/tests/Android.bp b/libs/vr/libbufferhubqueue/tests/Android.bp index 21a675f29e..865573cafd 100644 --- a/libs/vr/libbufferhubqueue/tests/Android.bp +++ b/libs/vr/libbufferhubqueue/tests/Android.bp @@ -28,9 +28,6 @@ cc_test { "-DTRACE=0", "-O0", "-g", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later ], name: "buffer_hub_queue-test", tags: ["optional"], @@ -45,9 +42,6 @@ cc_test { "-DTRACE=0", "-O0", "-g", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later ], name: "buffer_hub_queue_producer-test", tags: ["optional"], diff --git a/libs/vr/libdisplay/Android.bp b/libs/vr/libdisplay/Android.bp index abc8159a9b..d90521a810 100644 --- a/libs/vr/libdisplay/Android.bp +++ b/libs/vr/libdisplay/Android.bp @@ -55,8 +55,6 @@ cc_library { "-DATRACE_TAG=ATRACE_TAG_GRAPHICS", "-DGL_GLEXT_PROTOTYPES", "-DEGL_EGLEXT_PROTOTYPES", - "-Wall", - "-Werror", ], // + [ "-UNDEBUG", "-DDEBUG", "-O0", "-g" ], export_include_dirs: localIncludeFiles, shared_libs: sharedLibraries, diff --git a/libs/vr/libdisplay/include/dvr/dvr_display_types.h b/libs/vr/libdisplay/include/dvr/dvr_display_types.h index fd69843292..25364d8590 100644 --- a/libs/vr/libdisplay/include/dvr/dvr_display_types.h +++ b/libs/vr/libdisplay/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]; } float32x4x4_t; +typedef struct float32x4x4_t { float32x4_t val[4]; }; #endif #endif diff --git a/libs/vr/libdvr/Android.bp b/libs/vr/libdvr/Android.bp index 65123d6075..7a7c8aa5ee 100644 --- a/libs/vr/libdvr/Android.bp +++ b/libs/vr/libdvr/Android.bp @@ -22,8 +22,6 @@ cc_library_headers { cflags = [ "-DLOG_TAG=\"libdvr\"", "-DTRACE=0", - "-Wall", - "-Werror", ] srcs = [ diff --git a/libs/vr/libdvr/tests/Android.bp b/libs/vr/libdvr/tests/Android.bp index 21e9643956..ef746e207a 100644 --- a/libs/vr/libdvr/tests/Android.bp +++ b/libs/vr/libdvr/tests/Android.bp @@ -48,11 +48,6 @@ cc_test { "-DTRACE=0", "-O0", "-g", - "-Wall", - "-Werror", - "-Wno-error=macro-redefined", // to fix later - "-Wno-error=sign-compare", // to fix later - "-Wno-unused-variable", ], name: "dvr_api-test", } diff --git a/libs/vr/libdvrcommon/Android.bp b/libs/vr/libdvrcommon/Android.bp index 8d2becaf4a..527cdbdd2a 100644 --- a/libs/vr/libdvrcommon/Android.bp +++ b/libs/vr/libdvrcommon/Android.bp @@ -40,8 +40,6 @@ cc_library { cflags: [ "-DLOG_TAG=\"libdvrcommon\"", "-DTRACE=0", - "-Wall", - "-Werror", ], export_include_dirs: localIncludeFiles, @@ -61,11 +59,6 @@ cc_test { tags: ["optional"], srcs: testFiles, - cflags: [ - "-Wall", - "-Werror", - "-Wno-unused-parameter", - ], shared_libs: sharedLibraries, diff --git a/libs/vr/libperformance/Android.bp b/libs/vr/libperformance/Android.bp index 6a4687629e..364873dae2 100644 --- a/libs/vr/libperformance/Android.bp +++ b/libs/vr/libperformance/Android.bp @@ -32,9 +32,7 @@ cc_library { srcs: sourceFiles, cflags: [ "-DLOG_TAG=\"libperformance\"", - "-DTRACE=0", - "-Wall", - "-Werror", + "-DTRACE=0" ], export_include_dirs: includeFiles, static_libs: staticLibraries, diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp index f2c88ad604..de26a74f48 100644 --- a/libs/vr/libvrflinger/Android.bp +++ b/libs/vr/libvrflinger/Android.bp @@ -71,10 +71,6 @@ cc_library_static { "-DATRACE_TAG=ATRACE_TAG_GRAPHICS", "-DGL_GLEXT_PROTOTYPES", "-DEGL_EGLEXT_PROTOTYPES", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // to fix later - "-Wno-unused-variable", ], shared_libs: sharedLibraries, whole_static_libs: staticLibraries, diff --git a/libs/vr/libvrsensor/Android.bp b/libs/vr/libvrsensor/Android.bp index 1a15b6a571..abad78b338 100644 --- a/libs/vr/libvrsensor/Android.bp +++ b/libs/vr/libvrsensor/Android.bp @@ -40,10 +40,6 @@ sharedLibraries = [ cc_library { srcs: sourceFiles, - cflags: [ - "-Wall", - "-Werror", - ], export_include_dirs: includeFiles, static_libs: staticLibraries, shared_libs: sharedLibraries, diff --git a/libs/vr/libvrsensor/include/dvr/pose_client.h b/libs/vr/libvrsensor/include/dvr/pose_client.h index d32df64391..ed75f84216 100644 --- a/libs/vr/libvrsensor/include/dvr/pose_client.h +++ b/libs/vr/libvrsensor/include/dvr/pose_client.h @@ -7,7 +7,7 @@ #ifndef __FLOAT32X4T_86 #define __FLOAT32X4T_86 typedef float float32x4_t __attribute__ ((__vector_size__ (16))); -typedef struct float32x4x4_t { float32x4_t val[4]; } float32x4x4_t; +typedef struct float32x4x4_t { float32x4_t val[4]; }; #endif #endif diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp index 88a5a611c6..5cb201ded3 100644 --- a/services/vr/hardware_composer/Android.bp +++ b/services/vr/hardware_composer/Android.bp @@ -43,11 +43,6 @@ cc_library_shared { cflags: [ "-DLOG_TAG=\"vr_hwc\"", - "-Wall", - "-Werror", - "-Wno-error=sign-compare", // fix later - "-Wno-unused-private-field", - "-Wno-unused-parameter", ], } @@ -61,7 +56,6 @@ 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, @@ -97,8 +91,6 @@ cc_library_static { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", - "-Wall", - "-Werror", ], } @@ -127,8 +119,6 @@ cc_binary { ], cflags: [ "-DLOG_TAG=\"vr_hwc\"", - "-Wall", - "-Werror", ], init_rc: [ "vr_hwc.rc", @@ -139,12 +129,6 @@ 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 919d12423c..3d5dfb271a 100644 --- a/services/vr/virtual_touchpad/Android.bp +++ b/services/vr/virtual_touchpad/Android.bp @@ -18,11 +18,7 @@ cc_library { export_include_dirs: ["include"], shared_libs: shared_libs, cppflags: ["-std=c++11"], - cflags: [ - "-DLOG_TAG=\"VrVirtualTouchpad\"", - "-Wall", - "-Werror", - ], + cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""], name: "libvirtualtouchpad", tags: ["optional"], } @@ -55,12 +51,6 @@ cc_test { name: "VirtualTouchpad_test", stl: "libc++_static", tags: [ "optional" ], - cflags: [ - "-Wall", - "-Werror", - "-Wno-unused-function", - "-Wno-unused-variable", - ], } // Service. @@ -90,8 +80,6 @@ cc_binary { cppflags: ["-std=c++11"], cflags: [ "-DLOG_TAG=\"VrVirtualTouchpad\"", - "-Wall", - "-Werror", ], host_ldlibs: ["-llog"], name: "virtual_touchpad", @@ -120,11 +108,7 @@ cc_library { srcs: client_src, shared_libs: client_shared_libs, cppflags: ["-std=c++11"], - cflags: [ - "-DLOG_TAG=\"VirtualTouchpadClient\"", - "-Wall", - "-Werror", - ], + cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""], host_ldlibs: ["-llog"], name: "libvirtualtouchpadclient", tags: ["optional"], |