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

Commit b8ecc059 authored by Orion Hodson's avatar Orion Hodson
Browse files

Sync generator script with manual Java changes 

Incorporate manual changes to generated Java files back into the
generator.

Bug: 126352534
Bug: 124338141
Test: ./gen and check output has no commands for java files to be run.

Change-Id: Ie5f48d704b1485316718ae19b20016a08e688916
parent 77b510f1

opengl/tools/glgen/gen

+7 −2
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ 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



pushd out > /dev/null

mkdir classes

javac -d classes    android/opengl/EGL14.java \
@@ -109,7 +113,8 @@ javac -d classes android/opengl/EGL14.java \ 
                    android/opengl/GLES30.java \

                    android/opengl/GLES31.java \

                    android/opengl/GLES31Ext.java \

                    android/opengl/GLES32.java

                    android/opengl/GLES32.java \

                    android/annotation/UnsupportedAppUsage.java

popd > /dev/null

JAVA_RESULT=$?

if [ $JAVA_RESULT -ne 0 ]; then
@@ -142,7 +147,7 @@ compareGenerated() { 
            echo

            SAID_PLEASE=1

        fi

        echo "    cp $2/$3 $1"

        echo "    cp $2/$3 $1/$3"

        echo "    (cd $1; git add $3)"

        KEEP_GENERATED=1

    fi

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

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


package android.opengl;



import android.annotation.UnsupportedAppUsage;

import android.graphics.SurfaceTexture;

import android.view.Surface;

import android.view.SurfaceView;

opengl/tools/glgen/stubs/egl/eglGetDisplay.java

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    /**

     * {@hide}

     */

    @UnsupportedAppUsage

    public static native EGLDisplay eglGetDisplay(

        long display_id

    );

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;



/** OpenGL ES 2.0

 */

public class GLES20 {

opengl/tools/glgen/stubs/gles11/glGetActiveAttrib.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
    // C function void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )



    /** @hide Method is broken, but used to be public (b/6006380) */

    @UnsupportedAppUsage

    public static native void glGetActiveAttrib(

        int program,

        int index,