diff options
| author | 2019-12-11 14:37:35 +0000 | |
|---|---|---|
| committer | 2019-12-11 14:37:35 +0000 | |
| commit | 6783dfb308ec86067e0af3f34e1bc695731bee6f (patch) | |
| tree | 8110bd42c3b194da734bd10e82f110f10b0afdaa | |
| parent | 8fc7c37cfd27b544cc625017f2de554b65fc4eb6 (diff) | |
Use new UnsupportedAppUsage annotation.
Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I17478d80070fff10eb083cfe633093383d5aedad
| -rwxr-xr-x | opengl/tools/glgen/gen | 6 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/egl/EGL14Header.java-if | 2 | ||||
| -rw-r--r-- | opengl/tools/glgen/stubs/gles11/GLES20Header.java-if | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/opengl/tools/glgen/gen b/opengl/tools/glgen/gen index da9bb49495..41fcf1bd95 100755 --- a/opengl/tools/glgen/gen +++ b/opengl/tools/glgen/gen @@ -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 diff --git a/opengl/tools/glgen/stubs/egl/EGL14Header.java-if b/opengl/tools/glgen/stubs/egl/EGL14Header.java-if index 12728f588f..9932556d27 100644 --- a/opengl/tools/glgen/stubs/egl/EGL14Header.java-if +++ b/opengl/tools/glgen/stubs/egl/EGL14Header.java-if @@ -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; diff --git a/opengl/tools/glgen/stubs/gles11/GLES20Header.java-if b/opengl/tools/glgen/stubs/gles11/GLES20Header.java-if index c2711aa4db..7db11015ad 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES20Header.java-if +++ b/opengl/tools/glgen/stubs/gles11/GLES20Header.java-if @@ -19,7 +19,7 @@ package android.opengl; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** OpenGL ES 2.0 */ |