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

Commit 7de53d69 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge changes Iad983802,Icda236ee 

* changes:
  opengl: Fix #include style in generated JNI code
  opengl: Un-hide GLES31 and GLES31Ext classes
parents d754583d 9626f820

api/current.txt

+526 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android_opengl_GLES10.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



#include "jni.h"

#include "JNIHelp.h"

#include <jni.h>

#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>

#include <assert.h>

core/jni/android_opengl_GLES10Ext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



#include "jni.h"

#include "JNIHelp.h"

#include <jni.h>

#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>

#include <assert.h>

core/jni/android_opengl_GLES11.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



#include "jni.h"

#include "JNIHelp.h"

#include <jni.h>

#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>

#include <assert.h>

core/jni/android_opengl_GLES11Ext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



#include "jni.h"

#include "JNIHelp.h"

#include <jni.h>

#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <utils/misc.h>

#include <assert.h>