diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp
index 2819fe9..17725f8 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -42,9 +42,6 @@
         "-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 @@
     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 efd5cc7..a7c33ee 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -48,11 +48,6 @@
         "-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 21a675f..865573c 100644
--- a/libs/vr/libbufferhubqueue/tests/Android.bp
+++ b/libs/vr/libbufferhubqueue/tests/Android.bp
@@ -28,9 +28,6 @@
         "-DTRACE=0",
         "-O0",
         "-g",
-        "-Wall",
-        "-Werror",
-        "-Wno-error=sign-compare", // to fix later
     ],
     name: "buffer_hub_queue-test",
     tags: ["optional"],
@@ -45,9 +42,6 @@
         "-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 abc8159..d90521a 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -55,8 +55,6 @@
         "-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 fd69843..25364d8 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 @@
 #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 65123d6..7a7c8aa 100644
--- a/libs/vr/libdvr/Android.bp
+++ b/libs/vr/libdvr/Android.bp
@@ -22,8 +22,6 @@
 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 21e9643..ef746e2 100644
--- a/libs/vr/libdvr/tests/Android.bp
+++ b/libs/vr/libdvr/tests/Android.bp
@@ -48,11 +48,6 @@
         "-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 8d2beca..527cdbd 100644
--- a/libs/vr/libdvrcommon/Android.bp
+++ b/libs/vr/libdvrcommon/Android.bp
@@ -40,8 +40,6 @@
     cflags: [
         "-DLOG_TAG=\"libdvrcommon\"",
         "-DTRACE=0",
-        "-Wall",
-        "-Werror",
     ],
     export_include_dirs: localIncludeFiles,
 
@@ -61,11 +59,6 @@
     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 6a46876..364873d 100644
--- a/libs/vr/libperformance/Android.bp
+++ b/libs/vr/libperformance/Android.bp
@@ -32,9 +32,7 @@
     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 f2c88ad..de26a74 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -71,10 +71,6 @@
         "-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 1a15b6a..abad78b 100644
--- a/libs/vr/libvrsensor/Android.bp
+++ b/libs/vr/libvrsensor/Android.bp
@@ -40,10 +40,6 @@
 
 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 d32df64..ed75f84 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 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",
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"],