diff --git a/.ci_tools/build_samples.sh b/.ci_tools/build_samples.sh deleted file mode 100755 index a9f73de67..000000000 --- a/.ci_tools/build_samples.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash - -# - Configure SDK/NDK locations so we do not depends on local.properties, e.g -# - export ANDROID_HOME=$HOME/dev/sdk -# - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle -# - executing in repo root directory - -declare projects=( - audio-echo - bitmap-plasma - camera - display-p3 - endless-tunnel - exceptions - gles3jni - hello-gl2 - hello-vulkan - hello-jni - hello-jniCallback - hello-libs - hello-neon - hello-oboe - native-activity - native-audio - native-codec - native-media - native-midi - native-plasma - nn-samples - prefab/curl-ssl - prefab/prefab-dependency - prefab/prefab-publishing - san-angeles - sensor-graph - teapots - unit-test - webp - ) - -LINT_FAILURES=$(mktemp) -BUILD_FAILURES=$(mktemp) -APK_FAILURES=$(mktemp) - -VERBOSITY=--quiet -if [ -n "${RUNNER_DEBUG+1}" ] ; then - VERBOSITY=--info -fi -for d in "${projects[@]}"; do - pushd ${d} >/dev/null - echo "Building ${d}" - if ! TERM=dumb ./gradlew ${VERBOSITY} clean lint ; then - export SAMPLE_CI_RESULT=1 - echo ${d} >> ${LINT_FAILURES} - fi - if ! TERM=dumb ./gradlew ${VERBOSITY} assembleDebug ; then - export SAMPLE_CI_RESULT=1 - echo ${d} >> ${BUILD_FAILURES} - fi - popd >/dev/null -done - - -# Check the apks that all get built fine -declare apks=( - audio-echo/app/build/outputs/apk/debug/app-debug.apk - bitmap-plasma/app/build/outputs/apk/debug/app-debug.apk - camera/basic/build/outputs/apk/debug/basic-debug.apk - camera/texture-view/build/outputs/apk/debug/texture-view-debug.apk - display-p3/image-view/build/outputs/apk/debug/image-view-debug.apk - endless-tunnel/app/build/outputs/apk/debug/app-debug.apk - exceptions/app/build/outputs/apk/debug/app-debug.apk - gles3jni/app/build/outputs/apk/debug/app-debug.apk - hello-gl2/app/build/outputs/apk/debug/app-debug.apk - hello-vulkan/app/build/outputs/apk/debug/app-debug.apk - hello-jni/app/build/outputs/apk/debug/app-debug.apk - hello-jniCallback/app/build/outputs/apk/debug/app-debug.apk - hello-libs/app/build/outputs/apk/debug/app-debug.apk - hello-neon/app/build/outputs/apk/debug/app-debug.apk - hello-oboe/app/build/outputs/apk/debug/app-debug.apk - native-activity/app/build/outputs/apk/debug/app-debug.apk - native-audio/app/build/outputs/apk/debug/app-debug.apk - native-codec/app/build/outputs/apk/debug/app-debug.apk - native-media/app/build/outputs/apk/debug/app-debug.apk - native-midi/app/build/outputs/apk/debug/app-debug.apk - native-plasma/app/build/outputs/apk/debug/app-debug.apk - nn-samples/basic/build/outputs/apk/debug/basic-debug.apk - nn-samples/sequence/build/outputs/apk/debug/sequence-debug.apk - prefab/curl-ssl/app/build/outputs/apk/debug/app-debug.apk - prefab/prefab-publishing/mylibrary/build/outputs/aar/mylibrary-debug.aar - prefab/prefab-dependency/app/build/outputs/apk/debug/app-debug.apk - sensor-graph/accelerometer/build/outputs/apk/debug/accelerometer-debug.apk - san-angeles/app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk - san-angeles/app/build/outputs/apk/debug/app-arm64-v8a-debug.apk - san-angeles/app/build/outputs/apk/debug/app-x86-debug.apk - teapots/classic-teapot/build/outputs/apk/debug/classic-teapot-debug.apk - teapots/more-teapots/build/outputs/apk/debug/more-teapots-debug.apk - teapots/choreographer-30fps/build/outputs/apk/debug/choreographer-30fps-debug.apk - teapots/image-decoder/build/outputs/apk/debug/image-decoder-debug.apk - unit-test/app/build/outputs/apk/debug/app-debug.apk - webp/view/build/outputs/apk/debug/view-debug.apk -) - -for apk in "${apks[@]}"; do - if [ ! -f ${apk} ]; then - export SAMPLE_CI_RESULT=1 - echo ${apk} >> ${APK_FAILURES} - fi -done - -if [ -s ${LINT_FAILURES} ]; then - echo - echo "******* Lint failures ********" - cat ${LINT_FAILURES} -fi - -if [ -s ${BUILD_FAILURES} ]; then - echo - echo "******* Build failures ********" - cat ${BUILD_FAILURES} -fi - -if [ -s ${APK_FAILURES} ]; then - echo - echo "******* Missing APKs ********" - cat ${APK_FAILURES} -fi - -if [ ! -s ${LINT_FAILURES} ] && [ ! -s ${BUILD_FAILURES} ] && [ ! -s ${APK_FAILURES} ]; then - echo - echo "======= BUILD SUCCESS =======" -fi - -rm -f ${LINT_FAILURES} ${BUILD_FAILURES} ${APK_FAILURES} - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41b41c5ad..7676fda62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,7 @@ jobs: - name: build samples run: | - export SAMPLE_CI_RESULT=0 - source .ci_tools/build_samples.sh - eval "[[ $SAMPLE_CI_RESULT == 0 ]]" + ./gradlew build - uses: pre-commit/action@v3.0.0 diff --git a/.google/packaging.yaml b/.google/packaging.yaml new file mode 100644 index 000000000..6847cd773 --- /dev/null +++ b/.google/packaging.yaml @@ -0,0 +1,13 @@ +status: PUBLISHED +technologies: + - Android + - NDK + - Platform +categories: + - NDK +languages: + - C++ +solutions: + - Mobile +github: android/ndk-samples +license: apache2 diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..8967292d3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.jetbrainsKotlinAndroid) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..fd5ffa134 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,22 @@ +# 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. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true +android.nonFinalResIds=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..9a8de10b5 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,20 @@ +[versions] +agp = "8.4.0" +kotlin = "1.7.21" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +appcompat = "1.6.1" +material = "1.12.0" + +[libraries] +junit = { group = "junit", name = "junit", version.ref = "junit" } +ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e708b1c02 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 000000000..d4f7a089b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 06 16:21:05 PDT 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..7cba55385 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,65 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "NDK Samples" +include(":audio-echo:app") +include(":bitmap-plasma:app") +include(":camera:basic") +include(":camera:texture-view") +include(":display-p3:image-view") +include(":endless-tunnel:app") +include(":exceptions:app") +include(":gles3jni:app") +include(":hello-gl2:app") +include(":hello-jni:app") +include(":hello-jniCallback:app") +include(":hello-libs:app") +// To generate libs used in this sample: +// 1) enable the gen-libs at end of this file +// 2) enable module build dependency in app/build.gradle +// 3) build the app's APK in Android Studio or on command line +// 4) undo step 1) and 2) above +// include(":hello-libs:gen-libs") +include(":hello-neon:app") +include(":hello-oboe:app") +include(":hello-vulkan:app") +include(":native-activity:app") +include(":native-audio:app") +include(":native-codec:app") +include(":native-media:app") +include(":native-midi:app") +include(":native-plasma:app") +include(":nn-samples:basic") +include(":nn-samples:sequence") +include(":orderfile:app") +include(":prefab:curl-ssl:app") +include(":prefab:prefab-dependency:app") +include(":prefab:prefab-publishing:mylibrary") +include(":san-angeles:app") +include(":sanitizers:app") +include(":sensor-graph:app") +include(":teapots:choreographer-30fps") +include(":teapots:classic-teapot") +include(":teapots:image-decoder") +include(":teapots:more-teapots") +include(":teapots:textured-teapot") +include(":unit-test:app") +include(":webp:view")