diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml new file mode 100644 index 00000000..a59496f2 --- /dev/null +++ b/.github/workflows/Android-CI.yml @@ -0,0 +1,26 @@ +name: CI Android + +on: + pull_request: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: 11 + - name: Build with Gradle + run: ./gradlew build + - name: Archive Lint report + uses: actions/upload-artifact@v3.1.2 + if: ${{ always() }} + with: + name: OpenGL-Lint-report + path: ./**/build/reports/lint-results*.html \ No newline at end of file diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 00000000..97232cb5 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,17 @@ +name: "Validate Gradle Wrapper" + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: gradle/wrapper-validation-action@v1.0.5 diff --git a/.gitignore b/.gitignore index 67052f77..05e55b81 100644 --- a/.gitignore +++ b/.gitignore @@ -17,16 +17,16 @@ /artifacts /out *.swp -.idea/workspace.xml -.idea/tasks.xml + +.idea/* +!.idea/codeStyles/ +!.idea/copyright/ + .externalNativeBuild build *.iml -gradle -gradlew -gradlew.bat -gradle-wrapper .idea .gradle local.properties docs/ +.cxx diff --git a/build.gradle b/build.gradle index e6699367..eb25aa0a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - ext { //minPlatformGles2 = 12 minPlatformGles3 = 18 @@ -8,20 +6,17 @@ ext { buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:7.3.1' } } allprojects { repositories { - jcenter() + mavenCentral() google() } } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..39e93996 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..943f0cbf Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..f398c33c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..65dcd68d --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/advanced_samples/AntiAlias/AndroidManifest.xml b/samples/advanced_samples/AntiAlias/AndroidManifest.xml index cc8d8896..17fd7a73 100644 --- a/samples/advanced_samples/AntiAlias/AndroidManifest.xml +++ b/samples/advanced_samples/AntiAlias/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/AntiAlias/build.gradle b/samples/advanced_samples/AntiAlias/build.gradle index 450b86a3..0fb4db98 100644 --- a/samples/advanced_samples/AntiAlias/build.gradle +++ b/samples/advanced_samples/AntiAlias/build.gradle @@ -5,12 +5,12 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 - ndkVersion "21.4.7075529" + compileSdkVersion 33 + ndkVersion "24.0.8215888" defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/AstcTextures/AndroidManifest.xml b/samples/advanced_samples/AstcTextures/AndroidManifest.xml index 8059f3e7..03b575a7 100644 --- a/samples/advanced_samples/AstcTextures/AndroidManifest.xml +++ b/samples/advanced_samples/AstcTextures/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/AstcTextures/build.gradle b/samples/advanced_samples/AstcTextures/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/AstcTextures/build.gradle +++ b/samples/advanced_samples/AstcTextures/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/AstcTexturesLowPrecision/AndroidManifest.xml b/samples/advanced_samples/AstcTexturesLowPrecision/AndroidManifest.xml index f8727171..6acd6a7f 100644 --- a/samples/advanced_samples/AstcTexturesLowPrecision/AndroidManifest.xml +++ b/samples/advanced_samples/AstcTexturesLowPrecision/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/AstcTexturesLowPrecision/build.gradle b/samples/advanced_samples/AstcTexturesLowPrecision/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/AstcTexturesLowPrecision/build.gradle +++ b/samples/advanced_samples/AstcTexturesLowPrecision/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/AstcTexturesLowPrecision/jni/Application.mk b/samples/advanced_samples/AstcTexturesLowPrecision/jni/Application.mk index 54c4f12e..4e65e3eb 100644 --- a/samples/advanced_samples/AstcTexturesLowPrecision/jni/Application.mk +++ b/samples/advanced_samples/AstcTexturesLowPrecision/jni/Application.mk @@ -1,3 +1,5 @@ # [Application makefile] APP_STL := stlport_static -# [Application makefile] \ No newline at end of file +# [Application makefile] + +APP_ABI := arm64-v8a armeabi-v7a x86 x86_64 \ No newline at end of file diff --git a/samples/advanced_samples/ComputeParticles/AndroidManifest.xml b/samples/advanced_samples/ComputeParticles/AndroidManifest.xml index 0416f749..e1c2cc85 100644 --- a/samples/advanced_samples/ComputeParticles/AndroidManifest.xml +++ b/samples/advanced_samples/ComputeParticles/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -10,6 +13,4 @@ - - diff --git a/samples/advanced_samples/ComputeParticles/build.gradle b/samples/advanced_samples/ComputeParticles/build.gradle index 9145552f..9f951674 100644 --- a/samples/advanced_samples/ComputeParticles/build.gradle +++ b/samples/advanced_samples/ComputeParticles/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles32}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Cube/AndroidManifest.xml b/samples/advanced_samples/Cube/AndroidManifest.xml index 8aaa63e4..c448a306 100644 --- a/samples/advanced_samples/Cube/AndroidManifest.xml +++ b/samples/advanced_samples/Cube/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/Cube/build.gradle b/samples/advanced_samples/Cube/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/Cube/build.gradle +++ b/samples/advanced_samples/Cube/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/EGLPreserve/AndroidManifest.xml b/samples/advanced_samples/EGLPreserve/AndroidManifest.xml index da206d21..36c5f5ac 100644 --- a/samples/advanced_samples/EGLPreserve/AndroidManifest.xml +++ b/samples/advanced_samples/EGLPreserve/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/EGLPreserve/build.gradle b/samples/advanced_samples/EGLPreserve/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/EGLPreserve/build.gradle +++ b/samples/advanced_samples/EGLPreserve/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ETCAtlasAlpha/AndroidManifest.xml b/samples/advanced_samples/ETCAtlasAlpha/AndroidManifest.xml index 5434931a..db725908 100644 --- a/samples/advanced_samples/ETCAtlasAlpha/AndroidManifest.xml +++ b/samples/advanced_samples/ETCAtlasAlpha/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ETCAtlasAlpha/build.gradle b/samples/advanced_samples/ETCAtlasAlpha/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/ETCAtlasAlpha/build.gradle +++ b/samples/advanced_samples/ETCAtlasAlpha/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ETCCompressedAlpha/AndroidManifest.xml b/samples/advanced_samples/ETCCompressedAlpha/AndroidManifest.xml index adce67eb..065249f7 100644 --- a/samples/advanced_samples/ETCCompressedAlpha/AndroidManifest.xml +++ b/samples/advanced_samples/ETCCompressedAlpha/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ETCCompressedAlpha/build.gradle b/samples/advanced_samples/ETCCompressedAlpha/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/ETCCompressedAlpha/build.gradle +++ b/samples/advanced_samples/ETCCompressedAlpha/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ETCMipmap/AndroidManifest.xml b/samples/advanced_samples/ETCMipmap/AndroidManifest.xml index 92c871a7..9f7cf886 100644 --- a/samples/advanced_samples/ETCMipmap/AndroidManifest.xml +++ b/samples/advanced_samples/ETCMipmap/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ETCMipmap/build.gradle b/samples/advanced_samples/ETCMipmap/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/ETCMipmap/build.gradle +++ b/samples/advanced_samples/ETCMipmap/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ETCUncompressedAlpha/AndroidManifest.xml b/samples/advanced_samples/ETCUncompressedAlpha/AndroidManifest.xml index 0b11148d..8029dadc 100644 --- a/samples/advanced_samples/ETCUncompressedAlpha/AndroidManifest.xml +++ b/samples/advanced_samples/ETCUncompressedAlpha/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ETCUncompressedAlpha/build.gradle b/samples/advanced_samples/ETCUncompressedAlpha/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/ETCUncompressedAlpha/build.gradle +++ b/samples/advanced_samples/ETCUncompressedAlpha/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/FFTOceanWater/AndroidManifest.xml b/samples/advanced_samples/FFTOceanWater/AndroidManifest.xml index c89ccee6..7df2da48 100755 --- a/samples/advanced_samples/FFTOceanWater/AndroidManifest.xml +++ b/samples/advanced_samples/FFTOceanWater/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/FFTOceanWater/build.gradle b/samples/advanced_samples/FFTOceanWater/build.gradle index 9145552f..9f951674 100644 --- a/samples/advanced_samples/FFTOceanWater/build.gradle +++ b/samples/advanced_samples/FFTOceanWater/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles32}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/FrameBufferObject/AndroidManifest.xml b/samples/advanced_samples/FrameBufferObject/AndroidManifest.xml index 36954905..847741aa 100644 --- a/samples/advanced_samples/FrameBufferObject/AndroidManifest.xml +++ b/samples/advanced_samples/FrameBufferObject/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/FrameBufferObject/build.gradle b/samples/advanced_samples/FrameBufferObject/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/FrameBufferObject/build.gradle +++ b/samples/advanced_samples/FrameBufferObject/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/HighQualityTextJava/AndroidManifest.xml b/samples/advanced_samples/HighQualityTextJava/AndroidManifest.xml index 7f429d6b..f06a1444 100644 --- a/samples/advanced_samples/HighQualityTextJava/AndroidManifest.xml +++ b/samples/advanced_samples/HighQualityTextJava/AndroidManifest.xml @@ -6,7 +6,8 @@ + android:label="@string/app_name" + android:exported="true"> diff --git a/samples/advanced_samples/HighQualityTextJava/build.gradle b/samples/advanced_samples/HighQualityTextJava/build.gradle index 9f9d74ed..b04246f0 100644 --- a/samples/advanced_samples/HighQualityTextJava/build.gradle +++ b/samples/advanced_samples/HighQualityTextJava/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ListEGLConfigs/AndroidManifest.xml b/samples/advanced_samples/ListEGLConfigs/AndroidManifest.xml index 2015895d..b7e14973 100644 --- a/samples/advanced_samples/ListEGLConfigs/AndroidManifest.xml +++ b/samples/advanced_samples/ListEGLConfigs/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ListEGLConfigs/build.gradle b/samples/advanced_samples/ListEGLConfigs/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/ListEGLConfigs/build.gradle +++ b/samples/advanced_samples/ListEGLConfigs/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Metaballs/AndroidManifest.xml b/samples/advanced_samples/Metaballs/AndroidManifest.xml index e36810e2..44163422 100644 --- a/samples/advanced_samples/Metaballs/AndroidManifest.xml +++ b/samples/advanced_samples/Metaballs/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/Metaballs/build.gradle b/samples/advanced_samples/Metaballs/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/Metaballs/build.gradle +++ b/samples/advanced_samples/Metaballs/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/MultisampledFBO/AndroidManifest.xml b/samples/advanced_samples/MultisampledFBO/AndroidManifest.xml index 0f515e36..b871c59f 100644 --- a/samples/advanced_samples/MultisampledFBO/AndroidManifest.xml +++ b/samples/advanced_samples/MultisampledFBO/AndroidManifest.xml @@ -1,16 +1,17 @@ + + - + - + - + - - diff --git a/samples/advanced_samples/MultisampledFBO/build.gradle b/samples/advanced_samples/MultisampledFBO/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/MultisampledFBO/build.gradle +++ b/samples/advanced_samples/MultisampledFBO/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/OcclusionCulling/AndroidManifest.xml b/samples/advanced_samples/OcclusionCulling/AndroidManifest.xml index 8a590f62..270c7682 100755 --- a/samples/advanced_samples/OcclusionCulling/AndroidManifest.xml +++ b/samples/advanced_samples/OcclusionCulling/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/OcclusionCulling/build.gradle b/samples/advanced_samples/OcclusionCulling/build.gradle index 9145552f..9f951674 100644 --- a/samples/advanced_samples/OcclusionCulling/build.gradle +++ b/samples/advanced_samples/OcclusionCulling/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles32}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ProceduralGeometry/AndroidManifest.xml b/samples/advanced_samples/ProceduralGeometry/AndroidManifest.xml index 639002f9..d8cf3919 100644 --- a/samples/advanced_samples/ProceduralGeometry/AndroidManifest.xml +++ b/samples/advanced_samples/ProceduralGeometry/AndroidManifest.xml @@ -1,11 +1,15 @@ - + - + + + + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> @@ -13,6 +17,4 @@ - - diff --git a/samples/advanced_samples/ProceduralGeometry/build.gradle b/samples/advanced_samples/ProceduralGeometry/build.gradle index 9145552f..9f951674 100644 --- a/samples/advanced_samples/ProceduralGeometry/build.gradle +++ b/samples/advanced_samples/ProceduralGeometry/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles32}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/RenderToTextureJava/AndroidManifest.xml b/samples/advanced_samples/RenderToTextureJava/AndroidManifest.xml index 543415be..0496a0eb 100644 --- a/samples/advanced_samples/RenderToTextureJava/AndroidManifest.xml +++ b/samples/advanced_samples/RenderToTextureJava/AndroidManifest.xml @@ -1,12 +1,11 @@ + package="com.arm.malideveloper.openglessdk.rendertotexturejava"> + android:label="@string/app_name" + android:exported="true"> diff --git a/samples/advanced_samples/RenderToTextureJava/build.gradle b/samples/advanced_samples/RenderToTextureJava/build.gradle index 9f9d74ed..cb74881f 100644 --- a/samples/advanced_samples/RenderToTextureJava/build.gradle +++ b/samples/advanced_samples/RenderToTextureJava/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/RotoZoom/AndroidManifest.xml b/samples/advanced_samples/RotoZoom/AndroidManifest.xml index 1e21ce81..2bd00f54 100644 --- a/samples/advanced_samples/RotoZoom/AndroidManifest.xml +++ b/samples/advanced_samples/RotoZoom/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/RotoZoom/build.gradle b/samples/advanced_samples/RotoZoom/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/RotoZoom/build.gradle +++ b/samples/advanced_samples/RotoZoom/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Skybox/AndroidManifest.xml b/samples/advanced_samples/Skybox/AndroidManifest.xml index b9662747..a970514d 100644 --- a/samples/advanced_samples/Skybox/AndroidManifest.xml +++ b/samples/advanced_samples/Skybox/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/Skybox/build.gradle b/samples/advanced_samples/Skybox/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/Skybox/build.gradle +++ b/samples/advanced_samples/Skybox/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/SpinningCubeJava/AndroidManifest.xml b/samples/advanced_samples/SpinningCubeJava/AndroidManifest.xml index abad005a..166f81d7 100644 --- a/samples/advanced_samples/SpinningCubeJava/AndroidManifest.xml +++ b/samples/advanced_samples/SpinningCubeJava/AndroidManifest.xml @@ -1,12 +1,11 @@ + package="com.arm.malideveloper.openglessdk.spinningcubejava"> + android:label="@string/app_name" + android:exported="true"> diff --git a/samples/advanced_samples/SpinningCubeJava/build.gradle b/samples/advanced_samples/SpinningCubeJava/build.gradle index 9f9d74ed..cb74881f 100644 --- a/samples/advanced_samples/SpinningCubeJava/build.gradle +++ b/samples/advanced_samples/SpinningCubeJava/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Template/AndroidManifest.xml b/samples/advanced_samples/Template/AndroidManifest.xml index 2e76df04..90b5f36d 100644 --- a/samples/advanced_samples/Template/AndroidManifest.xml +++ b/samples/advanced_samples/Template/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/Template/build.gradle b/samples/advanced_samples/Template/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/Template/build.gradle +++ b/samples/advanced_samples/Template/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/TemplateJava/AndroidManifest.xml b/samples/advanced_samples/TemplateJava/AndroidManifest.xml index ca2fb09a..8f74fc24 100644 --- a/samples/advanced_samples/TemplateJava/AndroidManifest.xml +++ b/samples/advanced_samples/TemplateJava/AndroidManifest.xml @@ -1,12 +1,11 @@ + package="com.arm.malideveloper.openglessdk.templatejava"> + android:label="@string/app_name" + android:exported="true"> diff --git a/samples/advanced_samples/TemplateJava/build.gradle b/samples/advanced_samples/TemplateJava/build.gradle index 9f9d74ed..cb74881f 100644 --- a/samples/advanced_samples/TemplateJava/build.gradle +++ b/samples/advanced_samples/TemplateJava/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Terrain/AndroidManifest.xml b/samples/advanced_samples/Terrain/AndroidManifest.xml index 54c0508e..e7c33754 100755 --- a/samples/advanced_samples/Terrain/AndroidManifest.xml +++ b/samples/advanced_samples/Terrain/AndroidManifest.xml @@ -1,7 +1,7 @@ - + diff --git a/samples/advanced_samples/Terrain/build.gradle b/samples/advanced_samples/Terrain/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/Terrain/build.gradle +++ b/samples/advanced_samples/Terrain/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Tessellation/AndroidManifest.xml b/samples/advanced_samples/Tessellation/AndroidManifest.xml index 67de5b4a..39955422 100644 --- a/samples/advanced_samples/Tessellation/AndroidManifest.xml +++ b/samples/advanced_samples/Tessellation/AndroidManifest.xml @@ -1,16 +1,18 @@ - - + + + + + - + - + - - diff --git a/samples/advanced_samples/Tessellation/build.gradle b/samples/advanced_samples/Tessellation/build.gradle index 9145552f..9f951674 100644 --- a/samples/advanced_samples/Tessellation/build.gradle +++ b/samples/advanced_samples/Tessellation/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles32}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/ThreadSync/AndroidManifest.xml b/samples/advanced_samples/ThreadSync/AndroidManifest.xml index be48b51e..47440c4c 100644 --- a/samples/advanced_samples/ThreadSync/AndroidManifest.xml +++ b/samples/advanced_samples/ThreadSync/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/ThreadSync/build.gradle b/samples/advanced_samples/ThreadSync/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/ThreadSync/build.gradle +++ b/samples/advanced_samples/ThreadSync/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Translucency/AndroidManifest.xml b/samples/advanced_samples/Translucency/AndroidManifest.xml index 29bb9564..a43b5ff1 100644 --- a/samples/advanced_samples/Translucency/AndroidManifest.xml +++ b/samples/advanced_samples/Translucency/AndroidManifest.xml @@ -1,12 +1,13 @@ - - + + - + - + diff --git a/samples/advanced_samples/Translucency/build.gradle b/samples/advanced_samples/Translucency/build.gradle index caf914db..36bf3354 100644 --- a/samples/advanced_samples/Translucency/build.gradle +++ b/samples/advanced_samples/Translucency/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/Triangle/AndroidManifest.xml b/samples/advanced_samples/Triangle/AndroidManifest.xml index 29d8a12d..457b19e9 100644 --- a/samples/advanced_samples/Triangle/AndroidManifest.xml +++ b/samples/advanced_samples/Triangle/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/advanced_samples/Triangle/build.gradle b/samples/advanced_samples/Triangle/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/advanced_samples/Triangle/build.gradle +++ b/samples/advanced_samples/Triangle/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/advanced_samples/common_java/build.gradle b/samples/advanced_samples/common_java/build.gradle index da933205..01dcae04 100644 --- a/samples/advanced_samples/common_java/build.gradle +++ b/samples/advanced_samples/common_java/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 } + namespace 'com.arm.malideveloper.openglessdk.common_java' } diff --git a/samples/advanced_samples/common_java/src/main/AndroidManifest.xml b/samples/advanced_samples/common_java/src/main/AndroidManifest.xml index f0726a2d..8adfe3cb 100644 --- a/samples/advanced_samples/common_java/src/main/AndroidManifest.xml +++ b/samples/advanced_samples/common_java/src/main/AndroidManifest.xml @@ -1,2 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/samples/tutorials/AssetLoading/AndroidManifest.xml b/samples/tutorials/AssetLoading/AndroidManifest.xml index a6d551c3..8fa319d6 100644 --- a/samples/tutorials/AssetLoading/AndroidManifest.xml +++ b/samples/tutorials/AssetLoading/AndroidManifest.xml @@ -1,15 +1,16 @@ - - + + + + - + - + - - diff --git a/samples/tutorials/AssetLoading/build.gradle b/samples/tutorials/AssetLoading/build.gradle index 56eb479d..1d7f8b2c 100644 --- a/samples/tutorials/AssetLoading/build.gradle +++ b/samples/tutorials/AssetLoading/build.gradle @@ -5,12 +5,12 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 - ndkVersion "21.4.7075529" + compileSdkVersion 33 + ndkVersion "24.0.8215888" defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { // The bundled .so is for ARMv7 only. diff --git a/samples/tutorials/Bloom/AndroidManifest.xml b/samples/tutorials/Bloom/AndroidManifest.xml index c270dc5c..03489c13 100644 --- a/samples/tutorials/Bloom/AndroidManifest.xml +++ b/samples/tutorials/Bloom/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/Bloom/build.gradle b/samples/tutorials/Bloom/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/Bloom/build.gradle +++ b/samples/tutorials/Bloom/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Boids/AndroidManifest.xml b/samples/tutorials/Boids/AndroidManifest.xml index e8454ccd..c3fba7f7 100644 --- a/samples/tutorials/Boids/AndroidManifest.xml +++ b/samples/tutorials/Boids/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/Boids/build.gradle b/samples/tutorials/Boids/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/Boids/build.gradle +++ b/samples/tutorials/Boids/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/EtcTexture/AndroidManifest.xml b/samples/tutorials/EtcTexture/AndroidManifest.xml index d587d3fe..6282a6d4 100644 --- a/samples/tutorials/EtcTexture/AndroidManifest.xml +++ b/samples/tutorials/EtcTexture/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/EtcTexture/build.gradle b/samples/tutorials/EtcTexture/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/EtcTexture/build.gradle +++ b/samples/tutorials/EtcTexture/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/FileLoading/AndroidManifest.xml b/samples/tutorials/FileLoading/AndroidManifest.xml index 8fc683ad..e3619795 100644 --- a/samples/tutorials/FileLoading/AndroidManifest.xml +++ b/samples/tutorials/FileLoading/AndroidManifest.xml @@ -3,15 +3,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/FileLoading/build.gradle b/samples/tutorials/FileLoading/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/FileLoading/build.gradle +++ b/samples/tutorials/FileLoading/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/FirstNative/AndroidManifest.xml b/samples/tutorials/FirstNative/AndroidManifest.xml index e365892d..2624354b 100644 --- a/samples/tutorials/FirstNative/AndroidManifest.xml +++ b/samples/tutorials/FirstNative/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/FirstNative/build.gradle b/samples/tutorials/FirstNative/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/FirstNative/build.gradle +++ b/samples/tutorials/FirstNative/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/FoveatedRendering/AndroidManifest.xml b/samples/tutorials/FoveatedRendering/AndroidManifest.xml index daff89c8..7a141f79 100644 --- a/samples/tutorials/FoveatedRendering/AndroidManifest.xml +++ b/samples/tutorials/FoveatedRendering/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/FoveatedRendering/build.gradle b/samples/tutorials/FoveatedRendering/build.gradle index 05613371..5f4ba694 100644 --- a/samples/tutorials/FoveatedRendering/build.gradle +++ b/samples/tutorials/FoveatedRendering/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/GraphicsSetup/AndroidManifest.xml b/samples/tutorials/GraphicsSetup/AndroidManifest.xml index d1dc1523..abaf6156 100644 --- a/samples/tutorials/GraphicsSetup/AndroidManifest.xml +++ b/samples/tutorials/GraphicsSetup/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/GraphicsSetup/build.gradle b/samples/tutorials/GraphicsSetup/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/GraphicsSetup/build.gradle +++ b/samples/tutorials/GraphicsSetup/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/InstancedTessellation/AndroidManifest.xml b/samples/tutorials/InstancedTessellation/AndroidManifest.xml index e02ad122..673ed73f 100644 --- a/samples/tutorials/InstancedTessellation/AndroidManifest.xml +++ b/samples/tutorials/InstancedTessellation/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/InstancedTessellation/build.gradle b/samples/tutorials/InstancedTessellation/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/InstancedTessellation/build.gradle +++ b/samples/tutorials/InstancedTessellation/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Instancing/AndroidManifest.xml b/samples/tutorials/Instancing/AndroidManifest.xml index 2cc1f09f..616e7638 100644 --- a/samples/tutorials/Instancing/AndroidManifest.xml +++ b/samples/tutorials/Instancing/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/Instancing/build.gradle b/samples/tutorials/Instancing/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/Instancing/build.gradle +++ b/samples/tutorials/Instancing/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/IntegerLogic/AndroidManifest.xml b/samples/tutorials/IntegerLogic/AndroidManifest.xml index 06b0b66e..5f901761 100644 --- a/samples/tutorials/IntegerLogic/AndroidManifest.xml +++ b/samples/tutorials/IntegerLogic/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/IntegerLogic/build.gradle b/samples/tutorials/IntegerLogic/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/IntegerLogic/build.gradle +++ b/samples/tutorials/IntegerLogic/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Lighting/AndroidManifest.xml b/samples/tutorials/Lighting/AndroidManifest.xml index 5ddfc030..58c2ee9f 100644 --- a/samples/tutorials/Lighting/AndroidManifest.xml +++ b/samples/tutorials/Lighting/AndroidManifest.xml @@ -1,16 +1,17 @@ - - + + + + - + - + - - diff --git a/samples/tutorials/Lighting/build.gradle b/samples/tutorials/Lighting/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/Lighting/build.gradle +++ b/samples/tutorials/Lighting/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/MinMaxBlending/AndroidManifest.xml b/samples/tutorials/MinMaxBlending/AndroidManifest.xml index b32ed4fc..b024e7c2 100644 --- a/samples/tutorials/MinMaxBlending/AndroidManifest.xml +++ b/samples/tutorials/MinMaxBlending/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/MinMaxBlending/build.gradle b/samples/tutorials/MinMaxBlending/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/MinMaxBlending/build.gradle +++ b/samples/tutorials/MinMaxBlending/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Mipmapping/AndroidManifest.xml b/samples/tutorials/Mipmapping/AndroidManifest.xml index 37d5276b..d2f54e42 100644 --- a/samples/tutorials/Mipmapping/AndroidManifest.xml +++ b/samples/tutorials/Mipmapping/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/Mipmapping/build.gradle b/samples/tutorials/Mipmapping/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/Mipmapping/build.gradle +++ b/samples/tutorials/Mipmapping/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Multiview/AndroidManifest.xml b/samples/tutorials/Multiview/AndroidManifest.xml index af0ecc3e..1fe49ff1 100644 --- a/samples/tutorials/Multiview/AndroidManifest.xml +++ b/samples/tutorials/Multiview/AndroidManifest.xml @@ -1,15 +1,16 @@ - - + + + + - + - + - - diff --git a/samples/tutorials/Multiview/build.gradle b/samples/tutorials/Multiview/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/Multiview/build.gradle +++ b/samples/tutorials/Multiview/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/NormalMapping/AndroidManifest.xml b/samples/tutorials/NormalMapping/AndroidManifest.xml index 0d974ad8..70c2388f 100644 --- a/samples/tutorials/NormalMapping/AndroidManifest.xml +++ b/samples/tutorials/NormalMapping/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/NormalMapping/build.gradle b/samples/tutorials/NormalMapping/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/NormalMapping/build.gradle +++ b/samples/tutorials/NormalMapping/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/OcclusionQueries/AndroidManifest.xml b/samples/tutorials/OcclusionQueries/AndroidManifest.xml index cf6b0ef4..382f35d2 100644 --- a/samples/tutorials/OcclusionQueries/AndroidManifest.xml +++ b/samples/tutorials/OcclusionQueries/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/OcclusionQueries/build.gradle b/samples/tutorials/OcclusionQueries/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/OcclusionQueries/build.gradle +++ b/samples/tutorials/OcclusionQueries/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/ProjectedLights/AndroidManifest.xml b/samples/tutorials/ProjectedLights/AndroidManifest.xml index 02fd8b91..3842dcd8 100644 --- a/samples/tutorials/ProjectedLights/AndroidManifest.xml +++ b/samples/tutorials/ProjectedLights/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/ProjectedLights/build.gradle b/samples/tutorials/ProjectedLights/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/ProjectedLights/build.gradle +++ b/samples/tutorials/ProjectedLights/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/ShadowMapping/AndroidManifest.xml b/samples/tutorials/ShadowMapping/AndroidManifest.xml index 20bde47d..646e53c1 100644 --- a/samples/tutorials/ShadowMapping/AndroidManifest.xml +++ b/samples/tutorials/ShadowMapping/AndroidManifest.xml @@ -1,8 +1,11 @@ - - + + + + @@ -11,5 +14,4 @@ - diff --git a/samples/tutorials/ShadowMapping/build.gradle b/samples/tutorials/ShadowMapping/build.gradle index caf914db..36bf3354 100644 --- a/samples/tutorials/ShadowMapping/build.gradle +++ b/samples/tutorials/ShadowMapping/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion "${minPlatformGles3}" - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/SimpleCube/AndroidManifest.xml b/samples/tutorials/SimpleCube/AndroidManifest.xml index b920068f..d9d15a01 100644 --- a/samples/tutorials/SimpleCube/AndroidManifest.xml +++ b/samples/tutorials/SimpleCube/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/SimpleCube/build.gradle b/samples/tutorials/SimpleCube/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/SimpleCube/build.gradle +++ b/samples/tutorials/SimpleCube/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/SimpleTriangle/AndroidManifest.xml b/samples/tutorials/SimpleTriangle/AndroidManifest.xml index 31f5c285..8c1c1023 100644 --- a/samples/tutorials/SimpleTriangle/AndroidManifest.xml +++ b/samples/tutorials/SimpleTriangle/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/SimpleTriangle/build.gradle b/samples/tutorials/SimpleTriangle/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/SimpleTriangle/build.gradle +++ b/samples/tutorials/SimpleTriangle/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/TextureCube/AndroidManifest.xml b/samples/tutorials/TextureCube/AndroidManifest.xml index ef5f30b0..0003edc9 100644 --- a/samples/tutorials/TextureCube/AndroidManifest.xml +++ b/samples/tutorials/TextureCube/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/TextureCube/build.gradle b/samples/tutorials/TextureCube/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/TextureCube/build.gradle +++ b/samples/tutorials/TextureCube/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Vbo/AndroidManifest.xml b/samples/tutorials/Vbo/AndroidManifest.xml index 8635902b..f26fa1bf 100644 --- a/samples/tutorials/Vbo/AndroidManifest.xml +++ b/samples/tutorials/Vbo/AndroidManifest.xml @@ -1,15 +1,17 @@ - - + + + + - + - + - diff --git a/samples/tutorials/Vbo/build.gradle b/samples/tutorials/Vbo/build.gradle index 8811a0e5..1b998fd0 100644 --- a/samples/tutorials/Vbo/build.gradle +++ b/samples/tutorials/Vbo/build.gradle @@ -5,11 +5,11 @@ def sample = new File(parent).getName() println sample android { - compileSdkVersion 28 + compileSdkVersion 33 defaultConfig { minSdkVersion 9 - targetSdkVersion 28 + targetSdkVersion 33 ndk { abiFilters 'armeabi-v7a', 'arm64-v8a' diff --git a/samples/tutorials/Vbo/jni/Native.cpp b/samples/tutorials/Vbo/jni/Native.cpp index 36788fca..c346348b 100644 --- a/samples/tutorials/Vbo/jni/Native.cpp +++ b/samples/tutorials/Vbo/jni/Native.cpp @@ -291,19 +291,19 @@ static void renderFrame() extern "C" { JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_init( - JNIEnv * env, jobject obj, jint width, jint height); + JNIEnv * env, jclass obj, jint width, jint height); JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_step( - JNIEnv * env, jobject obj); + JNIEnv * env, jclass obj); }; -JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_init( - JNIEnv * env, jobject obj, jint width, jint height) +extern "C" JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_init( + JNIEnv * env, jclass obj, jint width, jint height) { setupGraphics(width, height); } -JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_step( - JNIEnv * env, jobject obj) +extern "C" JNIEXPORT void JNICALL Java_com_arm_malideveloper_openglessdk_vbo_NativeLibrary_step( + JNIEnv * env, jclass obj) { renderFrame(); }