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

Commit 1dbd332c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "enable-unknown-warning-option" 

* changes:
  Port JNIHelp changes to GL stubs
  Remove GCC-specific pragma
parents 860c8b47 e800ccb5

opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp

+1 −2
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
// 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"

#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/android_view_Surface.h>

#include <android_runtime/android_graphics_SurfaceTexture.h>

opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp

+1 −2
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
// 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"

#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_runtime/android_view_Surface.h>

#include <android_runtime/android_graphics_SurfaceTexture.h>

opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.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>

opengl/tools/glgen/stubs/gles11/GLES10cHeader.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>

opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.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>