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

Commit 5b65df5d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: 27e06cc2 am: 240d8e0c 

Change-Id: I6ad5122115407fc8fa1d2ae8743c69d071e9d23c
parents 36a08efe 240d8e0c

opengl/tools/glgen/gen

+3 −3
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ fi 
rm src/*.class



# Add UnsupportedAppUsage.java to known sources.

mkdir -p out/android/annotation

cp ../../../../base/core/java/android/annotation/UnsupportedAppUsage.java out/android/annotation

mkdir -p out/android/compat/annotation

cp ../../../../../tools/platform-compat/annotation/src/java/android/compat/annotation/UnsupportedAppUsage.java out/android/compat/annotation



pushd out > /dev/null

mkdir classes
@@ -114,7 +114,7 @@ javac -d classes android/opengl/EGL14.java \ 
                    android/opengl/GLES31.java \

                    android/opengl/GLES31Ext.java \

                    android/opengl/GLES32.java \

                    android/annotation/UnsupportedAppUsage.java

                    android/compat/annotation/UnsupportedAppUsage.java

popd > /dev/null

JAVA_RESULT=$?

if [ $JAVA_RESULT -ne 0 ]; then

opengl/tools/glgen/stubs/egl/EGL14Header.java-if

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.graphics.SurfaceTexture;

import android.view.Surface;

import android.view.SurfaceView;

opengl/tools/glgen/stubs/gles11/GLES20Header.java-if

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



/** OpenGL ES 2.0

 */