commit d980f7a91d54da257a0b2d94a2d70263d11229e9
author Chih-hung Hsieh <chh@google.com> Thu Oct 12 02:46:39 2017 +0000
committer Chih-hung Hsieh <chh@google.com> Thu Oct 12 02:46:39 2017 +0000
tree 4a7e49f1b4917ff460837b8406c7ac56c3552730
parent 38a11928990e62b263abe2dada0ff1f43d878e7c

Revert "Use -Werror in frameworks/native/libs/vr"

This reverts commit 38a11928990e62b263abe2dada0ff1f43d878e7c.

Change-Id: I2315300d0c8d52e224907a4f8edcf0d53658a742

services/vr/hardware_composer/Android.bp

diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp
index 88a5a611..5cb201d 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -43,11 +43,6 @@
 
   cflags: [
     "-DLOG_TAG=\"vr_hwc\"",
-    "-Wall",
-    "-Werror",
-    "-Wno-error=sign-compare",  // fix later
-    "-Wno-unused-private-field",
-    "-Wno-unused-parameter",
   ],
 
 }
@@ -61,7 +56,6 @@
     "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 @@
   ],
   cflags: [
     "-DLOG_TAG=\"vr_hwc\"",
-    "-Wall",
-    "-Werror",
   ],
 }
 
@@ -127,8 +119,6 @@
   ],
   cflags: [
     "-DLOG_TAG=\"vr_hwc\"",
-    "-Wall",
-    "-Werror",
   ],
   init_rc: [
     "vr_hwc.rc",
@@ -139,12 +129,6 @@
   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",

services/vr/virtual_touchpad/Android.bp

diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp
index 919d124..3d5dfb2 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -18,11 +18,7 @@
     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 @@
     name: "VirtualTouchpad_test",
     stl: "libc++_static",
     tags: [ "optional" ],
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wno-unused-function",
-        "-Wno-unused-variable",
-    ],
 }
 
 // Service.
@@ -90,8 +80,6 @@
     cppflags: ["-std=c++11"],
     cflags: [
         "-DLOG_TAG=\"VrVirtualTouchpad\"",
-        "-Wall",
-        "-Werror",
     ],
     host_ldlibs: ["-llog"],
     name: "virtual_touchpad",
@@ -120,11 +108,7 @@
     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"],