Merge "Revert "Use -Werror in frameworks/native/libs/vr"" am: a6d2f5571c am: 4276e8a1e7
am: 3975700384
Change-Id: I20cdc3eb77519a45cd15e96118e5c6db0e818adb
diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp
index c50986a..f327200 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -48,9 +48,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,
@@ -69,10 +66,5 @@
shared_libs: sharedLibraries,
header_libs: headerLibraries,
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 614e5dc..93ccd0f 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -49,11 +49,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 b0622f0..8bd1ef1 100644
--- a/libs/vr/libbufferhubqueue/tests/Android.bp
+++ b/libs/vr/libbufferhubqueue/tests/Android.bp
@@ -32,9 +32,6 @@
"-DTRACE=0",
"-O0",
"-g",
- "-Wall",
- "-Werror",
- "-Wno-error=sign-compare", // to fix later
],
name: "buffer_hub_queue-test",
tags: ["optional"],
@@ -50,9 +47,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 8213ca2..e3ab7fa 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -57,8 +57,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/libdvr/Android.bp b/libs/vr/libdvr/Android.bp
index 04418d2..9fe161d 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/include/dvr/dvr_display_types.h b/libs/vr/libdvr/include/dvr/dvr_display_types.h
index fd69843..25364d8 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 @@
#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/tests/Android.bp b/libs/vr/libdvr/tests/Android.bp
index 106bba1..887766a 100644
--- a/libs/vr/libdvr/tests/Android.bp
+++ b/libs/vr/libdvr/tests/Android.bp
@@ -51,11 +51,6 @@
"-Wno-missing-field-initializers",
"-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 c7d808b..62aeb79 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 4d80e91..0fb2d84 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -77,10 +77,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 aacb402..d022adf 100644
--- a/libs/vr/libvrsensor/Android.bp
+++ b/libs/vr/libvrsensor/Android.bp
@@ -42,10 +42,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 b663a67..bb25f1d 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 d5944e0..9201520 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -44,11 +44,6 @@
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
- "-Wall",
- "-Werror",
- "-Wno-error=sign-compare", // fix later
- "-Wno-unused-private-field",
- "-Wno-unused-parameter",
],
}
@@ -62,7 +57,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,
@@ -98,8 +92,6 @@
],
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
- "-Wall",
- "-Werror",
],
}
@@ -128,8 +120,6 @@
],
cflags: [
"-DLOG_TAG=\"vr_hwc\"",
- "-Wall",
- "-Werror",
],
init_rc: [
"vr_hwc.rc",
@@ -140,12 +130,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 3e2e40f..6b11ce3 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -23,11 +23,7 @@
shared_libs: shared_libs,
header_libs: header_libraries,
cppflags: ["-std=c++11"],
- cflags: [
- "-DLOG_TAG=\"VrVirtualTouchpad\"",
- "-Wall",
- "-Werror",
- ],
+ cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""],
name: "libvirtualtouchpad",
tags: ["optional"],
}
@@ -57,12 +53,6 @@
name: "VirtualTouchpad_test",
stl: "libc++_static",
tags: [ "optional" ],
- cflags: [
- "-Wall",
- "-Werror",
- "-Wno-unused-function",
- "-Wno-unused-variable",
- ],
}
// Service.
@@ -93,8 +83,6 @@
cppflags: ["-std=c++11"],
cflags: [
"-DLOG_TAG=\"VrVirtualTouchpad\"",
- "-Wall",
- "-Werror",
],
host_ldlibs: ["-llog"],
name: "virtual_touchpad",
@@ -124,11 +112,7 @@
shared_libs: client_shared_libs,
header_libs: header_libraries,
cppflags: ["-std=c++11"],
- cflags: [
- "-DLOG_TAG=\"VirtualTouchpadClient\"",
- "-Wall",
- "-Werror",
- ],
+ cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""],
host_ldlibs: ["-llog"],
name: "libvirtualtouchpadclient",
tags: ["optional"],