diff --git a/BUILD.md b/BUILD.md index eb7a62a93..942d9bdf1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -32,9 +32,11 @@ Use the provided CMakeLists.txt with [CMake](https://cmake.org) to generate a bu ### [Android](android/) -Building on Android is done using the [Gradle Build Tool](https://gradle.org/): +Building on Android is done using the [Gradle Build Tool](https://gradle.org/). -If you want to build it through command line, set Android SDK/NDK by environment variable `ANDROID_SDK_ROOT`/`ANDROID_NDK_HOME`. +**The recommended way** is building via [Android Studio](https://developer.android.com/studio). Simply open the project folder ```android```, build and after that you can select the sample you want to run from the project list. + +If you want to build it via the command line, set Android SDK/NDK by environment variable `ANDROID_SDK_ROOT`/`ANDROID_NDK_HOME`. On Linux execute: @@ -48,8 +50,6 @@ On Windows execute ```gradlew.bat assembleDebug```. If you want to build and install on a connected device or emulator image, run ```gradle installDebug``` instead. -If you want to build it through [Android Studio](https://developer.android.com/studio), open project folder ```android``` in Android Studio. - ### macOS and iOS **Note:** Running these examples on macOS and iOS requires [**MoltenVK**](https://github.com/KhronosGroup/MoltenVK) and a device that supports the *Metal* api. diff --git a/android/build.gradle b/android/build.gradle index 6c30fd54d..c774fed51 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,7 +12,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:8.7.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -23,11 +23,23 @@ allprojects { google() mavenCentral() } + // This code is where all the magic happens and fixes the error. + subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace "de.saschawillems." + project.group + } + } + } + } + } } ext { abiFilters = "arm64-v8a" - minSdkVersion = 19 + minSdkVersion = 21 targetSdkVersion = 26 compileSdkVersion = 26 shaderPath = '../../../shaders/' diff --git a/android/examples/_template/src/main/AndroidManifest.xml b/android/examples/_template/src/main/AndroidManifest.xml index 911142b2b..d6b2ae8e7 100644 --- a/android/examples/_template/src/main/AndroidManifest.xml +++ b/android/examples/_template/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/bloom/src/main/AndroidManifest.xml b/android/examples/bloom/src/main/AndroidManifest.xml index 07962bd41..233f00560 100644 --- a/android/examples/bloom/src/main/AndroidManifest.xml +++ b/android/examples/bloom/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/bufferdeviceaddress/src/main/AndroidManifest.xml b/android/examples/bufferdeviceaddress/src/main/AndroidManifest.xml index e67632e40..cbc8668ff 100644 --- a/android/examples/bufferdeviceaddress/src/main/AndroidManifest.xml +++ b/android/examples/bufferdeviceaddress/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computecullandlod/src/main/AndroidManifest.xml b/android/examples/computecullandlod/src/main/AndroidManifest.xml index 3d8f09f99..9e85ce969 100644 --- a/android/examples/computecullandlod/src/main/AndroidManifest.xml +++ b/android/examples/computecullandlod/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computeheadless/src/main/AndroidManifest.xml b/android/examples/computeheadless/src/main/AndroidManifest.xml index ff2891973..da1e42b2f 100644 --- a/android/examples/computeheadless/src/main/AndroidManifest.xml +++ b/android/examples/computeheadless/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -10,7 +9,8 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computenbody/src/main/AndroidManifest.xml b/android/examples/computenbody/src/main/AndroidManifest.xml index d6a1348ab..ccc071227 100644 --- a/android/examples/computenbody/src/main/AndroidManifest.xml +++ b/android/examples/computenbody/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computeparticles/src/main/AndroidManifest.xml b/android/examples/computeparticles/src/main/AndroidManifest.xml index a8c15e55a..e7614e10c 100644 --- a/android/examples/computeparticles/src/main/AndroidManifest.xml +++ b/android/examples/computeparticles/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computeraytracing/src/main/AndroidManifest.xml b/android/examples/computeraytracing/src/main/AndroidManifest.xml index c7c943983..9286fa3d4 100644 --- a/android/examples/computeraytracing/src/main/AndroidManifest.xml +++ b/android/examples/computeraytracing/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/computeshader/src/main/AndroidManifest.xml b/android/examples/computeshader/src/main/AndroidManifest.xml index 2f1fe254c..dbb77b9f1 100644 --- a/android/examples/computeshader/src/main/AndroidManifest.xml +++ b/android/examples/computeshader/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/conditionalrender/src/main/AndroidManifest.xml b/android/examples/conditionalrender/src/main/AndroidManifest.xml index 534a1d61d..3ab90a77d 100644 --- a/android/examples/conditionalrender/src/main/AndroidManifest.xml +++ b/android/examples/conditionalrender/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/conservativeraster/src/main/AndroidManifest.xml b/android/examples/conservativeraster/src/main/AndroidManifest.xml index 168547131..e9daac074 100644 --- a/android/examples/conservativeraster/src/main/AndroidManifest.xml +++ b/android/examples/conservativeraster/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/debugprintf/src/main/AndroidManifest.xml b/android/examples/debugprintf/src/main/AndroidManifest.xml index c86a3ed45..bfb99c12d 100644 --- a/android/examples/debugprintf/src/main/AndroidManifest.xml +++ b/android/examples/debugprintf/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/debugutils/src/main/AndroidManifest.xml b/android/examples/debugutils/src/main/AndroidManifest.xml index f071dd32b..cdd22d062 100644 --- a/android/examples/debugutils/src/main/AndroidManifest.xml +++ b/android/examples/debugutils/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/deferred/src/main/AndroidManifest.xml b/android/examples/deferred/src/main/AndroidManifest.xml index b58906631..b1838c4ae 100644 --- a/android/examples/deferred/src/main/AndroidManifest.xml +++ b/android/examples/deferred/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/deferredmultisampling/src/main/AndroidManifest.xml b/android/examples/deferredmultisampling/src/main/AndroidManifest.xml index 0011ebe60..494264689 100644 --- a/android/examples/deferredmultisampling/src/main/AndroidManifest.xml +++ b/android/examples/deferredmultisampling/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/deferredshadows/src/main/AndroidManifest.xml b/android/examples/deferredshadows/src/main/AndroidManifest.xml index 504245dba..cdb0a40fd 100644 --- a/android/examples/deferredshadows/src/main/AndroidManifest.xml +++ b/android/examples/deferredshadows/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/descriptorbuffer/src/main/AndroidManifest.xml b/android/examples/descriptorbuffer/src/main/AndroidManifest.xml index 3699e36b8..7f1039fb4 100644 --- a/android/examples/descriptorbuffer/src/main/AndroidManifest.xml +++ b/android/examples/descriptorbuffer/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/descriptorindexing/src/main/AndroidManifest.xml b/android/examples/descriptorindexing/src/main/AndroidManifest.xml index 99a8f33f5..a85c15668 100644 --- a/android/examples/descriptorindexing/src/main/AndroidManifest.xml +++ b/android/examples/descriptorindexing/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/descriptorsets/src/main/AndroidManifest.xml b/android/examples/descriptorsets/src/main/AndroidManifest.xml index 7f04a3e3a..0dac572eb 100644 --- a/android/examples/descriptorsets/src/main/AndroidManifest.xml +++ b/android/examples/descriptorsets/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/displacement/src/main/AndroidManifest.xml b/android/examples/displacement/src/main/AndroidManifest.xml index edf236b97..3b6ca22b2 100644 --- a/android/examples/displacement/src/main/AndroidManifest.xml +++ b/android/examples/displacement/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/distancefieldfonts/src/main/AndroidManifest.xml b/android/examples/distancefieldfonts/src/main/AndroidManifest.xml index 070a14d7d..2a844fd4d 100644 --- a/android/examples/distancefieldfonts/src/main/AndroidManifest.xml +++ b/android/examples/distancefieldfonts/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/dynamicrendering/src/main/AndroidManifest.xml b/android/examples/dynamicrendering/src/main/AndroidManifest.xml index 4b572079c..d6c179109 100644 --- a/android/examples/dynamicrendering/src/main/AndroidManifest.xml +++ b/android/examples/dynamicrendering/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/dynamicstate/src/main/AndroidManifest.xml b/android/examples/dynamicstate/src/main/AndroidManifest.xml index 7579dc3b2..b1798ce70 100644 --- a/android/examples/dynamicstate/src/main/AndroidManifest.xml +++ b/android/examples/dynamicstate/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/dynamicuniformbuffer/src/main/AndroidManifest.xml b/android/examples/dynamicuniformbuffer/src/main/AndroidManifest.xml index f6ed456f7..171ffc866 100644 --- a/android/examples/dynamicuniformbuffer/src/main/AndroidManifest.xml +++ b/android/examples/dynamicuniformbuffer/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/gears/src/main/AndroidManifest.xml b/android/examples/gears/src/main/AndroidManifest.xml index c8338ffc3..da134b43c 100644 --- a/android/examples/gears/src/main/AndroidManifest.xml +++ b/android/examples/gears/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/geometryshader/src/main/AndroidManifest.xml b/android/examples/geometryshader/src/main/AndroidManifest.xml index a975812fc..dfbfd2cab 100644 --- a/android/examples/geometryshader/src/main/AndroidManifest.xml +++ b/android/examples/geometryshader/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/gltfloading/src/main/AndroidManifest.xml b/android/examples/gltfloading/src/main/AndroidManifest.xml index 2c6a34743..090e46c7f 100644 --- a/android/examples/gltfloading/src/main/AndroidManifest.xml +++ b/android/examples/gltfloading/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/gltfscenerendering/src/main/AndroidManifest.xml b/android/examples/gltfscenerendering/src/main/AndroidManifest.xml index a12e04f26..6ce148be1 100644 --- a/android/examples/gltfscenerendering/src/main/AndroidManifest.xml +++ b/android/examples/gltfscenerendering/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/gltfskinning/src/main/AndroidManifest.xml b/android/examples/gltfskinning/src/main/AndroidManifest.xml index d2ff525df..a9d112f1d 100644 --- a/android/examples/gltfskinning/src/main/AndroidManifest.xml +++ b/android/examples/gltfskinning/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/graphicspipelinelibrary/src/main/AndroidManifest.xml b/android/examples/graphicspipelinelibrary/src/main/AndroidManifest.xml index 55071d602..3a2b38ab9 100644 --- a/android/examples/graphicspipelinelibrary/src/main/AndroidManifest.xml +++ b/android/examples/graphicspipelinelibrary/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/hdr/src/main/AndroidManifest.xml b/android/examples/hdr/src/main/AndroidManifest.xml index 2ec30ec53..f2604321e 100644 --- a/android/examples/hdr/src/main/AndroidManifest.xml +++ b/android/examples/hdr/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/hostimagecopy/src/main/AndroidManifest.xml b/android/examples/hostimagecopy/src/main/AndroidManifest.xml index 91626a150..fcd8d7c5e 100644 --- a/android/examples/hostimagecopy/src/main/AndroidManifest.xml +++ b/android/examples/hostimagecopy/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/indirectdraw/src/main/AndroidManifest.xml b/android/examples/indirectdraw/src/main/AndroidManifest.xml index 6ae1ef865..60fa8e14f 100644 --- a/android/examples/indirectdraw/src/main/AndroidManifest.xml +++ b/android/examples/indirectdraw/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/inlineuniformblocks/src/main/AndroidManifest.xml b/android/examples/inlineuniformblocks/src/main/AndroidManifest.xml index ab24dcc3d..e97453915 100644 --- a/android/examples/inlineuniformblocks/src/main/AndroidManifest.xml +++ b/android/examples/inlineuniformblocks/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/inputattachments/src/main/AndroidManifest.xml b/android/examples/inputattachments/src/main/AndroidManifest.xml index 74054b143..0cfc68ca2 100644 --- a/android/examples/inputattachments/src/main/AndroidManifest.xml +++ b/android/examples/inputattachments/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/instancing/src/main/AndroidManifest.xml b/android/examples/instancing/src/main/AndroidManifest.xml index 2d98c6e31..6a1347047 100644 --- a/android/examples/instancing/src/main/AndroidManifest.xml +++ b/android/examples/instancing/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/meshshader/src/main/AndroidManifest.xml b/android/examples/meshshader/src/main/AndroidManifest.xml index 2153870f4..89ad0f7a8 100644 --- a/android/examples/meshshader/src/main/AndroidManifest.xml +++ b/android/examples/meshshader/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/multisampling/src/main/AndroidManifest.xml b/android/examples/multisampling/src/main/AndroidManifest.xml index 5ae16c0ca..aa1138408 100644 --- a/android/examples/multisampling/src/main/AndroidManifest.xml +++ b/android/examples/multisampling/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/multithreading/src/main/AndroidManifest.xml b/android/examples/multithreading/src/main/AndroidManifest.xml index fac797348..f002469a9 100644 --- a/android/examples/multithreading/src/main/AndroidManifest.xml +++ b/android/examples/multithreading/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/multiview/src/main/AndroidManifest.xml b/android/examples/multiview/src/main/AndroidManifest.xml index 97156f1f4..274906e20 100644 --- a/android/examples/multiview/src/main/AndroidManifest.xml +++ b/android/examples/multiview/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/negativeviewportheight/src/main/AndroidManifest.xml b/android/examples/negativeviewportheight/src/main/AndroidManifest.xml index ee8f26230..3455af63f 100644 --- a/android/examples/negativeviewportheight/src/main/AndroidManifest.xml +++ b/android/examples/negativeviewportheight/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/occlusionquery/src/main/AndroidManifest.xml b/android/examples/occlusionquery/src/main/AndroidManifest.xml index 1e50e1845..ab7386b96 100644 --- a/android/examples/occlusionquery/src/main/AndroidManifest.xml +++ b/android/examples/occlusionquery/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/offscreen/src/main/AndroidManifest.xml b/android/examples/offscreen/src/main/AndroidManifest.xml index 5572e30a1..97f3ce247 100644 --- a/android/examples/offscreen/src/main/AndroidManifest.xml +++ b/android/examples/offscreen/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/oit/src/main/AndroidManifest.xml b/android/examples/oit/src/main/AndroidManifest.xml index 2c8361827..994c28771 100644 --- a/android/examples/oit/src/main/AndroidManifest.xml +++ b/android/examples/oit/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/parallaxmapping/src/main/AndroidManifest.xml b/android/examples/parallaxmapping/src/main/AndroidManifest.xml index e40d99da3..a2b56a7a1 100644 --- a/android/examples/parallaxmapping/src/main/AndroidManifest.xml +++ b/android/examples/parallaxmapping/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/particlesystem/src/main/AndroidManifest.xml b/android/examples/particlesystem/src/main/AndroidManifest.xml index 4c7d04e42..51a08adea 100644 --- a/android/examples/particlesystem/src/main/AndroidManifest.xml +++ b/android/examples/particlesystem/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pbrbasic/src/main/AndroidManifest.xml b/android/examples/pbrbasic/src/main/AndroidManifest.xml index ed399c39b..38e5241a9 100644 --- a/android/examples/pbrbasic/src/main/AndroidManifest.xml +++ b/android/examples/pbrbasic/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pbribl/src/main/AndroidManifest.xml b/android/examples/pbribl/src/main/AndroidManifest.xml index e3288148f..af6d2595e 100644 --- a/android/examples/pbribl/src/main/AndroidManifest.xml +++ b/android/examples/pbribl/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pbrtexture/src/main/AndroidManifest.xml b/android/examples/pbrtexture/src/main/AndroidManifest.xml index 8ed371b98..2f048ce4d 100644 --- a/android/examples/pbrtexture/src/main/AndroidManifest.xml +++ b/android/examples/pbrtexture/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pipelines/src/main/AndroidManifest.xml b/android/examples/pipelines/src/main/AndroidManifest.xml index a6e7bc8a5..6fb6beed5 100644 --- a/android/examples/pipelines/src/main/AndroidManifest.xml +++ b/android/examples/pipelines/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pipelinestatistics/src/main/AndroidManifest.xml b/android/examples/pipelinestatistics/src/main/AndroidManifest.xml index a26c688c7..383bdc9a7 100644 --- a/android/examples/pipelinestatistics/src/main/AndroidManifest.xml +++ b/android/examples/pipelinestatistics/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pushconstants/src/main/AndroidManifest.xml b/android/examples/pushconstants/src/main/AndroidManifest.xml index da183bf2a..ae50caea3 100644 --- a/android/examples/pushconstants/src/main/AndroidManifest.xml +++ b/android/examples/pushconstants/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/pushdescriptors/src/main/AndroidManifest.xml b/android/examples/pushdescriptors/src/main/AndroidManifest.xml index 66b5cbbe0..f16f83369 100644 --- a/android/examples/pushdescriptors/src/main/AndroidManifest.xml +++ b/android/examples/pushdescriptors/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/radialblur/src/main/AndroidManifest.xml b/android/examples/radialblur/src/main/AndroidManifest.xml index f0ee4f17e..fc5cbf05a 100644 --- a/android/examples/radialblur/src/main/AndroidManifest.xml +++ b/android/examples/radialblur/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/rayquery/src/main/AndroidManifest.xml b/android/examples/rayquery/src/main/AndroidManifest.xml index d4bfb121a..c39760fa1 100644 --- a/android/examples/rayquery/src/main/AndroidManifest.xml +++ b/android/examples/rayquery/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingbasic/src/main/AndroidManifest.xml b/android/examples/raytracingbasic/src/main/AndroidManifest.xml index 067fafeda..0336f20c2 100644 --- a/android/examples/raytracingbasic/src/main/AndroidManifest.xml +++ b/android/examples/raytracingbasic/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingcallable/src/main/AndroidManifest.xml b/android/examples/raytracingcallable/src/main/AndroidManifest.xml index 02ff5009b..48486a726 100644 --- a/android/examples/raytracingcallable/src/main/AndroidManifest.xml +++ b/android/examples/raytracingcallable/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracinggltf/src/main/AndroidManifest.xml b/android/examples/raytracinggltf/src/main/AndroidManifest.xml index f0fd3bb32..8814f9389 100644 --- a/android/examples/raytracinggltf/src/main/AndroidManifest.xml +++ b/android/examples/raytracinggltf/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingintersection/src/main/AndroidManifest.xml b/android/examples/raytracingintersection/src/main/AndroidManifest.xml index 9a5eb5e9e..79217a3d0 100644 --- a/android/examples/raytracingintersection/src/main/AndroidManifest.xml +++ b/android/examples/raytracingintersection/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingpositionfetch/src/main/AndroidManifest.xml b/android/examples/raytracingpositionfetch/src/main/AndroidManifest.xml index 37683a527..9083b5361 100644 --- a/android/examples/raytracingpositionfetch/src/main/AndroidManifest.xml +++ b/android/examples/raytracingpositionfetch/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingreflections/src/main/AndroidManifest.xml b/android/examples/raytracingreflections/src/main/AndroidManifest.xml index bb6370683..1fe9d2d3b 100644 --- a/android/examples/raytracingreflections/src/main/AndroidManifest.xml +++ b/android/examples/raytracingreflections/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingsbtdata/src/main/AndroidManifest.xml b/android/examples/raytracingsbtdata/src/main/AndroidManifest.xml index 51b1181b3..75e7fea61 100644 --- a/android/examples/raytracingsbtdata/src/main/AndroidManifest.xml +++ b/android/examples/raytracingsbtdata/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingshadows/src/main/AndroidManifest.xml b/android/examples/raytracingshadows/src/main/AndroidManifest.xml index ae5447fd6..9888eec42 100644 --- a/android/examples/raytracingshadows/src/main/AndroidManifest.xml +++ b/android/examples/raytracingshadows/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/raytracingtextures/src/main/AndroidManifest.xml b/android/examples/raytracingtextures/src/main/AndroidManifest.xml index 5adf299b7..6d1b12e26 100644 --- a/android/examples/raytracingtextures/src/main/AndroidManifest.xml +++ b/android/examples/raytracingtextures/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/renderheadless/src/main/AndroidManifest.xml b/android/examples/renderheadless/src/main/AndroidManifest.xml index 6dd6b2276..918f513b6 100644 --- a/android/examples/renderheadless/src/main/AndroidManifest.xml +++ b/android/examples/renderheadless/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -10,7 +9,8 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/screenshot/src/main/AndroidManifest.xml b/android/examples/screenshot/src/main/AndroidManifest.xml index e2d9fd337..829bbf208 100644 --- a/android/examples/screenshot/src/main/AndroidManifest.xml +++ b/android/examples/screenshot/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -10,7 +9,8 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/shaderobjects/src/main/AndroidManifest.xml b/android/examples/shaderobjects/src/main/AndroidManifest.xml index 3ba2d3759..0f6f6c432 100644 --- a/android/examples/shaderobjects/src/main/AndroidManifest.xml +++ b/android/examples/shaderobjects/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/shadowmapping/src/main/AndroidManifest.xml b/android/examples/shadowmapping/src/main/AndroidManifest.xml index 2f98411a4..859e5afc7 100644 --- a/android/examples/shadowmapping/src/main/AndroidManifest.xml +++ b/android/examples/shadowmapping/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/shadowmappingcascade/src/main/AndroidManifest.xml b/android/examples/shadowmappingcascade/src/main/AndroidManifest.xml index a53062057..9eb23c033 100644 --- a/android/examples/shadowmappingcascade/src/main/AndroidManifest.xml +++ b/android/examples/shadowmappingcascade/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/shadowmappingomni/src/main/AndroidManifest.xml b/android/examples/shadowmappingomni/src/main/AndroidManifest.xml index 8bf397dc2..0fe3262a8 100644 --- a/android/examples/shadowmappingomni/src/main/AndroidManifest.xml +++ b/android/examples/shadowmappingomni/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/specializationconstants/src/main/AndroidManifest.xml b/android/examples/specializationconstants/src/main/AndroidManifest.xml index f51c78274..aa6e33c04 100644 --- a/android/examples/specializationconstants/src/main/AndroidManifest.xml +++ b/android/examples/specializationconstants/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/sphericalenvmapping/src/main/AndroidManifest.xml b/android/examples/sphericalenvmapping/src/main/AndroidManifest.xml index 3b6be14b9..17a4f280e 100644 --- a/android/examples/sphericalenvmapping/src/main/AndroidManifest.xml +++ b/android/examples/sphericalenvmapping/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/ssao/src/main/AndroidManifest.xml b/android/examples/ssao/src/main/AndroidManifest.xml index 8f5a76396..dad1de750 100644 --- a/android/examples/ssao/src/main/AndroidManifest.xml +++ b/android/examples/ssao/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/stencilbuffer/src/main/AndroidManifest.xml b/android/examples/stencilbuffer/src/main/AndroidManifest.xml index 42e98050c..8b0203164 100644 --- a/android/examples/stencilbuffer/src/main/AndroidManifest.xml +++ b/android/examples/stencilbuffer/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/subpasses/src/main/AndroidManifest.xml b/android/examples/subpasses/src/main/AndroidManifest.xml index 8c6043de4..3a7a1325b 100644 --- a/android/examples/subpasses/src/main/AndroidManifest.xml +++ b/android/examples/subpasses/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/terraintessellation/src/main/AndroidManifest.xml b/android/examples/terraintessellation/src/main/AndroidManifest.xml index 4723f70f9..f40a43ca0 100644 --- a/android/examples/terraintessellation/src/main/AndroidManifest.xml +++ b/android/examples/terraintessellation/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/tessellation/src/main/AndroidManifest.xml b/android/examples/tessellation/src/main/AndroidManifest.xml index 6f7c645c0..d9733f1d3 100644 --- a/android/examples/tessellation/src/main/AndroidManifest.xml +++ b/android/examples/tessellation/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/textoverlay/src/main/AndroidManifest.xml b/android/examples/textoverlay/src/main/AndroidManifest.xml index f3a05228f..0d0144e37 100644 --- a/android/examples/textoverlay/src/main/AndroidManifest.xml +++ b/android/examples/textoverlay/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texture/src/main/AndroidManifest.xml b/android/examples/texture/src/main/AndroidManifest.xml index 5482b6811..fc6705319 100644 --- a/android/examples/texture/src/main/AndroidManifest.xml +++ b/android/examples/texture/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texture3d/src/main/AndroidManifest.xml b/android/examples/texture3d/src/main/AndroidManifest.xml index 5ba253103..0d74927bf 100644 --- a/android/examples/texture3d/src/main/AndroidManifest.xml +++ b/android/examples/texture3d/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texturearray/src/main/AndroidManifest.xml b/android/examples/texturearray/src/main/AndroidManifest.xml index a466469a3..c1a04330d 100644 --- a/android/examples/texturearray/src/main/AndroidManifest.xml +++ b/android/examples/texturearray/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texturecubemap/src/main/AndroidManifest.xml b/android/examples/texturecubemap/src/main/AndroidManifest.xml index a1e81a201..e29148459 100644 --- a/android/examples/texturecubemap/src/main/AndroidManifest.xml +++ b/android/examples/texturecubemap/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texturecubemaparray/src/main/AndroidManifest.xml b/android/examples/texturecubemaparray/src/main/AndroidManifest.xml index f194d0d08..2e087df99 100644 --- a/android/examples/texturecubemaparray/src/main/AndroidManifest.xml +++ b/android/examples/texturecubemaparray/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texturemipmapgen/src/main/AndroidManifest.xml b/android/examples/texturemipmapgen/src/main/AndroidManifest.xml index d197eef0c..8c9142176 100644 --- a/android/examples/texturemipmapgen/src/main/AndroidManifest.xml +++ b/android/examples/texturemipmapgen/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/texturesparseresidency/src/main/AndroidManifest.xml b/android/examples/texturesparseresidency/src/main/AndroidManifest.xml index a56fd3d6c..cc16f3826 100644 --- a/android/examples/texturesparseresidency/src/main/AndroidManifest.xml +++ b/android/examples/texturesparseresidency/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/timelinesemaphore/src/main/AndroidManifest.xml b/android/examples/timelinesemaphore/src/main/AndroidManifest.xml index 2ff5501a9..821c8f6b1 100644 --- a/android/examples/timelinesemaphore/src/main/AndroidManifest.xml +++ b/android/examples/timelinesemaphore/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/triangle/src/main/AndroidManifest.xml b/android/examples/triangle/src/main/AndroidManifest.xml index 3dd53b0bf..020c68358 100644 --- a/android/examples/triangle/src/main/AndroidManifest.xml +++ b/android/examples/triangle/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/trianglevulkan13/src/main/AndroidManifest.xml b/android/examples/trianglevulkan13/src/main/AndroidManifest.xml index 505453d56..206434efc 100644 --- a/android/examples/trianglevulkan13/src/main/AndroidManifest.xml +++ b/android/examples/trianglevulkan13/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/variablerateshading/src/main/AndroidManifest.xml b/android/examples/variablerateshading/src/main/AndroidManifest.xml index aa90d20ff..5f51b1dda 100644 --- a/android/examples/variablerateshading/src/main/AndroidManifest.xml +++ b/android/examples/variablerateshading/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/vertexattributes/src/main/AndroidManifest.xml b/android/examples/vertexattributes/src/main/AndroidManifest.xml index 7345a1069..c78888df2 100644 --- a/android/examples/vertexattributes/src/main/AndroidManifest.xml +++ b/android/examples/vertexattributes/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/viewportarray/src/main/AndroidManifest.xml b/android/examples/viewportarray/src/main/AndroidManifest.xml index edbb29de0..921b4da78 100644 --- a/android/examples/viewportarray/src/main/AndroidManifest.xml +++ b/android/examples/viewportarray/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/examples/vulkanscene/src/main/AndroidManifest.xml b/android/examples/vulkanscene/src/main/AndroidManifest.xml index 6005450d9..9cb8a7a33 100644 --- a/android/examples/vulkanscene/src/main/AndroidManifest.xml +++ b/android/examples/vulkanscene/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:configChanges="orientation|keyboardHidden" + android:exported="true"> diff --git a/android/gradle.properties b/android/gradle.properties index d1e13c170..2b474b577 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -11,4 +11,7 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sun May 28 17:34:07 CST 2023 +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false org.gradle.jvmargs=-Xmx4096M diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp index ea6c06e29..c29a47b74 100644 --- a/base/vulkanexamplebase.cpp +++ b/base/vulkanexamplebase.cpp @@ -353,7 +353,7 @@ void VulkanExampleBase::renderLoop() focused = true; - while ((ident = ALooper_pollAll(focused ? 0 : -1, NULL, &events, (void**)&source)) >= 0) + while ((ident = ALooper_pollOnce(focused ? 0 : -1, NULL, &events, (void**)&source)) > ALOOPER_POLL_TIMEOUT) { if (source != NULL) { diff --git a/examples/computeheadless/computeheadless.cpp b/examples/computeheadless/computeheadless.cpp index aef7a62f1..79536bc9b 100644 --- a/examples/computeheadless/computeheadless.cpp +++ b/examples/computeheadless/computeheadless.cpp @@ -595,7 +595,7 @@ void android_main(android_app* state) { androidapp->onAppCmd = handleAppCommand; int ident, events; struct android_poll_source* source; - while ((ident = ALooper_pollAll(-1, NULL, &events, (void**)&source)) >= 0) { + while ((ident = ALooper_pollOnce(-1, NULL, &events, (void**)&source)) > ALOOPER_POLL_TIMEOUT) { if (source != NULL) { source->process(androidapp, source); } diff --git a/examples/renderheadless/renderheadless.cpp b/examples/renderheadless/renderheadless.cpp index 6b894b94d..f34656f32 100644 --- a/examples/renderheadless/renderheadless.cpp +++ b/examples/renderheadless/renderheadless.cpp @@ -930,7 +930,7 @@ void android_main(android_app* state) { androidapp->onAppCmd = handleAppCommand; int ident, events; struct android_poll_source* source; - while ((ident = ALooper_pollAll(-1, NULL, &events, (void**)&source)) >= 0) { + while ((ident = ALooper_pollOnce(-1, NULL, &events, (void**)&source)) > ALOOPER_POLL_TIMEOUT) { if (source != NULL) { source->process(androidapp, source); }