From fc9fd4758580c33708a0c9fb85092e93009d0b36 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Fri, 10 Nov 2017 13:51:10 -0800 Subject: [PATCH] Remove GCC-specific pragma and disabled Clang warning Bug: http://b/68236396 Do not suppress the GCC-specific -Wunused-but-set-variable warning, which Clang doesn't support. Test: Build the topic Change-Id: Ibeaaf927f44fe65f939d3d728c6fe642bcca595f --- core/jni/Android.bp | 4 ---- core/jni/android_opengl_EGL14.cpp | 1 - core/jni/android_opengl_EGLExt.cpp | 1 - core/jni/android_opengl_GLES10.cpp | 1 - core/jni/android_opengl_GLES10Ext.cpp | 1 - core/jni/android_opengl_GLES11.cpp | 1 - core/jni/android_opengl_GLES11Ext.cpp | 1 - core/jni/android_opengl_GLES20.cpp | 1 - core/jni/android_opengl_GLES30.cpp | 1 - core/jni/android_opengl_GLES31.cpp | 1 - core/jni/android_opengl_GLES31Ext.cpp | 1 - core/jni/android_opengl_GLES32.cpp | 1 - core/jni/com_google_android_gles_jni_GLImpl.cpp | 1 - 13 files changed, 16 deletions(-) diff --git a/core/jni/Android.bp b/core/jni/Android.bp index e7667ca191fd6..bc86dddd956f5 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -18,10 +18,6 @@ cc_library_shared { "-Wunused", "-Wunreachable-code", - // necessary for Clang as the GL bindings need to turn - // off a GCC warning that Clang doesn't know. - "-Wno-unknown-pragmas", - // TODO: Linear blending should be enabled by default, but we are // TODO: making it an opt-in while it's a work in progress //"-DANDROID_ENABLE_LINEAR_BLENDING", diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index 6163588662759..a9d75fd6aff77 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -17,7 +17,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" diff --git a/core/jni/android_opengl_EGLExt.cpp b/core/jni/android_opengl_EGLExt.cpp index df1aa2025b984..75a25fe95e09a 100644 --- a/core/jni/android_opengl_EGLExt.cpp +++ b/core/jni/android_opengl_EGLExt.cpp @@ -17,7 +17,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" diff --git a/core/jni/android_opengl_GLES10.cpp b/core/jni/android_opengl_GLES10.cpp index 6d4f6eccfdba4..ee5b5941202db 100644 --- a/core/jni/android_opengl_GLES10.cpp +++ b/core/jni/android_opengl_GLES10.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES10Ext.cpp b/core/jni/android_opengl_GLES10Ext.cpp index e630cfca64c8f..da7d0f01928ff 100644 --- a/core/jni/android_opengl_GLES10Ext.cpp +++ b/core/jni/android_opengl_GLES10Ext.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES11.cpp b/core/jni/android_opengl_GLES11.cpp index ab9cbb11a353a..391ae5366a3bc 100644 --- a/core/jni/android_opengl_GLES11.cpp +++ b/core/jni/android_opengl_GLES11.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES11Ext.cpp b/core/jni/android_opengl_GLES11Ext.cpp index 8f71a6d7dc491..09dce32b9e56b 100644 --- a/core/jni/android_opengl_GLES11Ext.cpp +++ b/core/jni/android_opengl_GLES11Ext.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp index f83d20467ea8d..99922cfe401df 100644 --- a/core/jni/android_opengl_GLES20.cpp +++ b/core/jni/android_opengl_GLES20.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index b649daf466074..adc635ed4eeac 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES31.cpp b/core/jni/android_opengl_GLES31.cpp index 07d920f87941b..512f562062e6d 100644 --- a/core/jni/android_opengl_GLES31.cpp +++ b/core/jni/android_opengl_GLES31.cpp @@ -17,7 +17,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES31Ext.cpp b/core/jni/android_opengl_GLES31Ext.cpp index 723dd4cd0b87a..5543fcadaed09 100644 --- a/core/jni/android_opengl_GLES31Ext.cpp +++ b/core/jni/android_opengl_GLES31Ext.cpp @@ -17,7 +17,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/android_opengl_GLES32.cpp b/core/jni/android_opengl_GLES32.cpp index 62a6e6c61394b..2f1e31e7fab91 100644 --- a/core/jni/android_opengl_GLES32.cpp +++ b/core/jni/android_opengl_GLES32.cpp @@ -17,7 +17,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp index ac23eca930147..40ff7e4c55172 100644 --- a/core/jni/com_google_android_gles_jni_GLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp @@ -18,7 +18,6 @@ // This source file is automatically generated #pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h"