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

Commit b6dc968f authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp... 

Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 87d4d356 am: e857355f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11985400

Change-Id: I69da8b55a714718229cc422a979462b79c231c1f
parents 69a531be e857355f

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 <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.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/EGL15cHeader.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 <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.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 <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.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 <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.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 <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>