diff --git a/BUILD.md b/BUILD.md index eb7a62a9..942d9bdf 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 6c30fd54..c774fed5 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 911142b2..d6b2ae8e 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 07962bd4..233f0056 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 e67632e4..cbc8668f 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 3d8f09f9..9e85ce96 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 ff289197..da1e42b2 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 d6a1348a..ccc07122 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 a8c15e55..e7614e10 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 c7c94398..9286fa3d 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 2f1fe254..dbb77b9f 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 534a1d61..3ab90a77 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 16854713..e9daac07 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 c86a3ed4..bfb99c12 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 f071dd32..cdd22d06 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 b5890663..b1838c4a 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 0011ebe6..49426468 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 504245db..cdb0a40f 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 3699e36b..7f1039fb 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 99a8f33f..a85c1566 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 7f04a3e3..0dac572e 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 edf236b9..3b6ca22b 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 070a14d7..2a844fd4 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 4b572079..d6c17910 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 7579dc3b..b1798ce7 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 f6ed456f..171ffc86 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 c8338ffc..da134b43 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 a975812f..dfbfd2ca 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 2c6a3474..090e46c7 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 a12e04f2..6ce148be 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 d2ff525d..a9d112f1 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 55071d60..3a2b38ab 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 2ec30ec5..f2604321 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 91626a15..fcd8d7c5 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 6ae1ef86..60fa8e14 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 ab24dcc3..e9745391 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 74054b14..0cfc68ca 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 2d98c6e3..6a134704 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 2153870f..89ad0f7a 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 5ae16c0c..aa113840 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 fac79734..f002469a 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 97156f1f..274906e2 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 ee8f2623..3455af63 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 1e50e184..ab7386b9 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 5572e30a..97f3ce24 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 2c836182..994c2877 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 e40d99da..a2b56a7a 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 4c7d04e4..51a08ade 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 ed399c39..38e5241a 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 e3288148..af6d2595 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 8ed371b9..2f048ce4 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 a6e7bc8a..6fb6beed 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 a26c688c..383bdc9a 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 da183bf2..ae50caea 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 66b5cbbe..f16f8336 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 f0ee4f17..fc5cbf05 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 d4bfb121..c39760fa 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 067fafed..0336f20c 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 02ff5009..48486a72 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 f0fd3bb3..8814f938 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 9a5eb5e9..79217a3d 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 37683a52..9083b536 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 bb637068..1fe9d2d3 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 51b1181b..75e7fea6 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 ae5447fd..9888eec4 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 5adf299b..6d1b12e2 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 6dd6b227..918f513b 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 e2d9fd33..829bbf20 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 3ba2d375..0f6f6c43 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 2f98411a..859e5afc 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 a5306205..9eb23c03 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 8bf397dc..0fe3262a 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 f51c7827..aa6e33c0 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 3b6be14b..17a4f280 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 8f5a7639..dad1de75 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 42e98050..8b020316 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 8c6043de..3a7a1325 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 4723f70f..f40a43ca 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 6f7c645c..d9733f1d 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 f3a05228..0d0144e3 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 5482b681..fc670531 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 5ba25310..0d74927b 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 a466469a..c1a04330 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 a1e81a20..e2914845 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 f194d0d0..2e087df9 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 d197eef0..8c914217 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 a56fd3d6..cc16f382 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 2ff5501a..821c8f6b 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 3dd53b0b..020c6835 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 505453d5..206434ef 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 aa90d20f..5f51b1dd 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 7345a106..c78888df 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 edbb29de..921b4da7 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 6005450d..9cb8a7a3 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 d1e13c17..2b474b57 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 ea6c06e2..c29a47b7 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 aef7a62f..79536bc9 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 6b894b94..f34656f3 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); }