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

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

Merge changes from topic "enable-unknown-warning-option" am: 1dbd332c 

am: 099f6321

Change-Id: Ic3a42d3b27edb5111bfd86ee11d562aebe322ca3
parents f3c3e9a9 099f6321

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#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 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#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/common.cpp

+1 −1
Original line number Diff line number Diff line 
#include <jni.h>

#include <JNIHelp.h>

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>

#include <assert.h>

opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#pragma GCC diagnostic ignored "-Wunused-function"



#include "jni.h"

#include "JNIHelp.h"

#include <nativehelper/JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>