Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b79fefb7 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by android-build-merger
Browse files

Merge "Remove GCC-specific pragma and disabled Clang warning" am: bcf27fa6 

am: 48a80c1a

Change-Id: Ib564870756d7dc89c7e65c9fa50439a65cd3f115
parents 58de99a2 48a80c1a

core/jni/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -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",

core/jni/android_opengl_EGL14.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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"

core/jni/android_opengl_EGLExt.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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"

core/jni/android_opengl_GLES10.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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 <GLES/gl.h>

core/jni/android_opengl_GLES10Ext.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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 <GLES/gl.h>