diff --git a/BUILD.md b/BUILD.md index ff2456d3..173874ae 100644 --- a/BUILD.md +++ b/BUILD.md @@ -23,16 +23,22 @@ Use the provided CMakeLists.txt with [CMake](https://cmake.org) to generate a bu 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`. + +On Linux execute: + ``` cd android ./gradlew assembleDebug ``` -This will download gradle locally, build all samples and output the apks to ```android\examples\bin```. +This will download gradle locally, build all samples and output the apks to ```android/examples/bin```. -On Windows execute `gradlew.bat assembleDebug`. +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. + ## [iOS and macOS](xcode/) Building for *iOS* and *macOS* is done using the [examples](xcode/examples.xcodeproj) *Xcode* project found in the [xcode](xcode) directory. These examples use the [**MoltenVK**](https://moltengl.com/moltenvk) Vulkan driver to provide Vulkan support on *iOS* and *macOS*, and require an *iOS* or *macOS* device that supports *Metal*. Please see the [MoltenVK Examples readme](xcode/README_MoltenVK_Examples.md) for more info on acquiring **MoltenVK** and building and deploying the examples on *iOS* and *macOS*. diff --git a/android/build.gradle b/android/build.gradle index 556f4dd7..7588f7fb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:7.0.0' @@ -21,11 +21,12 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } ext { + abiFilters = "arm64-v8a" minSdkVersion = 19 targetSdkVersion = 26 compileSdkVersion = 26 diff --git a/android/examples/_template/build.gradle b/android/examples/_template/build.gradle index eefe2a55..ff28692a 100644 --- a/android/examples/_template/build.gradle +++ b/android/examples/_template/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/bloom/build.gradle b/android/examples/bloom/build.gradle index bed7c0c1..17ddb414 100644 --- a/android/examples/bloom/build.gradle +++ b/android/examples/bloom/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computecloth/build.gradle b/android/examples/computecloth/build.gradle index 80d95ddd..a51092fb 100644 --- a/android/examples/computecloth/build.gradle +++ b/android/examples/computecloth/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computecullandlod/build.gradle b/android/examples/computecullandlod/build.gradle index 62eed3b7..173bb056 100644 --- a/android/examples/computecullandlod/build.gradle +++ b/android/examples/computecullandlod/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computeheadless/build.gradle b/android/examples/computeheadless/build.gradle index 0e0536c8..1c68bdcf 100644 --- a/android/examples/computeheadless/build.gradle +++ b/android/examples/computeheadless/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computenbody/build.gradle b/android/examples/computenbody/build.gradle index 6593d39f..73ec7863 100644 --- a/android/examples/computenbody/build.gradle +++ b/android/examples/computenbody/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computeparticles/build.gradle b/android/examples/computeparticles/build.gradle index bec13209..58d054a7 100644 --- a/android/examples/computeparticles/build.gradle +++ b/android/examples/computeparticles/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computeraytracing/build.gradle b/android/examples/computeraytracing/build.gradle index 215ecfb9..dd75ddc7 100644 --- a/android/examples/computeraytracing/build.gradle +++ b/android/examples/computeraytracing/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/computeshader/build.gradle b/android/examples/computeshader/build.gradle index 50762a7c..4fe97915 100644 --- a/android/examples/computeshader/build.gradle +++ b/android/examples/computeshader/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/conservativeraster/build.gradle b/android/examples/conservativeraster/build.gradle index 9ba83feb..b7abf2af 100644 --- a/android/examples/conservativeraster/build.gradle +++ b/android/examples/conservativeraster/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/debugmarker/build.gradle b/android/examples/debugmarker/build.gradle index 668c14e8..ac13d4a7 100644 --- a/android/examples/debugmarker/build.gradle +++ b/android/examples/debugmarker/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/deferred/build.gradle b/android/examples/deferred/build.gradle index 175cb767..46226069 100644 --- a/android/examples/deferred/build.gradle +++ b/android/examples/deferred/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/deferredmultisampling/build.gradle b/android/examples/deferredmultisampling/build.gradle index 64d98426..4d08713e 100644 --- a/android/examples/deferredmultisampling/build.gradle +++ b/android/examples/deferredmultisampling/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/deferredshadows/build.gradle b/android/examples/deferredshadows/build.gradle index 9a69fc4a..76ad5f81 100644 --- a/android/examples/deferredshadows/build.gradle +++ b/android/examples/deferredshadows/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/descriptorindexing/build.gradle b/android/examples/descriptorindexing/build.gradle index f61ed680..a56ebce4 100644 --- a/android/examples/descriptorindexing/build.gradle +++ b/android/examples/descriptorindexing/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/descriptorsets/build.gradle b/android/examples/descriptorsets/build.gradle index b40fabc7..7ea2181b 100644 --- a/android/examples/descriptorsets/build.gradle +++ b/android/examples/descriptorsets/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/displacement/build.gradle b/android/examples/displacement/build.gradle index 65f92506..0cd19008 100644 --- a/android/examples/displacement/build.gradle +++ b/android/examples/displacement/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/distancefieldfonts/build.gradle b/android/examples/distancefieldfonts/build.gradle index 6eccb50d..8dc4bb04 100644 --- a/android/examples/distancefieldfonts/build.gradle +++ b/android/examples/distancefieldfonts/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/dynamicuniformbuffer/build.gradle b/android/examples/dynamicuniformbuffer/build.gradle index f5bb1cfd..c743d4bb 100644 --- a/android/examples/dynamicuniformbuffer/build.gradle +++ b/android/examples/dynamicuniformbuffer/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/gears/build.gradle b/android/examples/gears/build.gradle index 66edd92b..770a11d1 100644 --- a/android/examples/gears/build.gradle +++ b/android/examples/gears/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/geometryshader/build.gradle b/android/examples/geometryshader/build.gradle index ffae1b1d..bddb5ab8 100644 --- a/android/examples/geometryshader/build.gradle +++ b/android/examples/geometryshader/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/gltfloading/build.gradle b/android/examples/gltfloading/build.gradle index f475101c..d8327e82 100644 --- a/android/examples/gltfloading/build.gradle +++ b/android/examples/gltfloading/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/gltfscenerendering/build.gradle b/android/examples/gltfscenerendering/build.gradle index 372031c2..34660ebc 100644 --- a/android/examples/gltfscenerendering/build.gradle +++ b/android/examples/gltfscenerendering/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/gltfskinning/build.gradle b/android/examples/gltfskinning/build.gradle index 4cbc9b59..001d53b6 100644 --- a/android/examples/gltfskinning/build.gradle +++ b/android/examples/gltfskinning/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/hdr/build.gradle b/android/examples/hdr/build.gradle index c3bd99c7..76404a06 100644 --- a/android/examples/hdr/build.gradle +++ b/android/examples/hdr/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/imgui/build.gradle b/android/examples/imgui/build.gradle index 26cdc5a0..8e46075f 100644 --- a/android/examples/imgui/build.gradle +++ b/android/examples/imgui/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/indirectdraw/build.gradle b/android/examples/indirectdraw/build.gradle index 66d8d878..e21c98dd 100644 --- a/android/examples/indirectdraw/build.gradle +++ b/android/examples/indirectdraw/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/inlineuniformblocks/build.gradle b/android/examples/inlineuniformblocks/build.gradle index 8fdee692..0892b747 100644 --- a/android/examples/inlineuniformblocks/build.gradle +++ b/android/examples/inlineuniformblocks/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/inputattachments/build.gradle b/android/examples/inputattachments/build.gradle index 1c70a375..9dace85d 100644 --- a/android/examples/inputattachments/build.gradle +++ b/android/examples/inputattachments/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/instancing/build.gradle b/android/examples/instancing/build.gradle index bd0c6a40..597f79c0 100644 --- a/android/examples/instancing/build.gradle +++ b/android/examples/instancing/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/multisampling/build.gradle b/android/examples/multisampling/build.gradle index 8ac6bff1..c0c620bb 100644 --- a/android/examples/multisampling/build.gradle +++ b/android/examples/multisampling/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/multithreading/build.gradle b/android/examples/multithreading/build.gradle index 1f2095ff..fbd26b6c 100644 --- a/android/examples/multithreading/build.gradle +++ b/android/examples/multithreading/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/multiview/build.gradle b/android/examples/multiview/build.gradle index bb1eab8e..d2acf842 100644 --- a/android/examples/multiview/build.gradle +++ b/android/examples/multiview/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/negativeviewportheight/build.gradle b/android/examples/negativeviewportheight/build.gradle index 0c2f4225..85b9642c 100644 --- a/android/examples/negativeviewportheight/build.gradle +++ b/android/examples/negativeviewportheight/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/occlusionquery/build.gradle b/android/examples/occlusionquery/build.gradle index 377e190b..9eaa7e0c 100644 --- a/android/examples/occlusionquery/build.gradle +++ b/android/examples/occlusionquery/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/offscreen/build.gradle b/android/examples/offscreen/build.gradle index cd3e30ec..9b700c7c 100644 --- a/android/examples/offscreen/build.gradle +++ b/android/examples/offscreen/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/oit/build.gradle b/android/examples/oit/build.gradle index 88b97ce7..28922c1d 100644 --- a/android/examples/oit/build.gradle +++ b/android/examples/oit/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/parallaxmapping/build.gradle b/android/examples/parallaxmapping/build.gradle index d3b0000a..93bd3f37 100644 --- a/android/examples/parallaxmapping/build.gradle +++ b/android/examples/parallaxmapping/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/particlefire/build.gradle b/android/examples/particlefire/build.gradle index 63f628e6..4b264e5c 100644 --- a/android/examples/particlefire/build.gradle +++ b/android/examples/particlefire/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pbrbasic/build.gradle b/android/examples/pbrbasic/build.gradle index 8b78a683..1dd8a954 100644 --- a/android/examples/pbrbasic/build.gradle +++ b/android/examples/pbrbasic/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pbribl/build.gradle b/android/examples/pbribl/build.gradle index 62e8c402..a2661f5f 100644 --- a/android/examples/pbribl/build.gradle +++ b/android/examples/pbribl/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pbrtexture/build.gradle b/android/examples/pbrtexture/build.gradle index 7c1f45d8..d1ca4b6f 100644 --- a/android/examples/pbrtexture/build.gradle +++ b/android/examples/pbrtexture/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pipelines/build.gradle b/android/examples/pipelines/build.gradle index 39d4f4e5..5ea5befa 100644 --- a/android/examples/pipelines/build.gradle +++ b/android/examples/pipelines/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pipelinestatistics/build.gradle b/android/examples/pipelinestatistics/build.gradle index 7ce56487..37a65c3e 100644 --- a/android/examples/pipelinestatistics/build.gradle +++ b/android/examples/pipelinestatistics/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pushconstants/build.gradle b/android/examples/pushconstants/build.gradle index 781404b1..7bc6f50e 100644 --- a/android/examples/pushconstants/build.gradle +++ b/android/examples/pushconstants/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/pushdescriptors/build.gradle b/android/examples/pushdescriptors/build.gradle index d4cfa547..87155a70 100644 --- a/android/examples/pushdescriptors/build.gradle +++ b/android/examples/pushdescriptors/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/radialblur/build.gradle b/android/examples/radialblur/build.gradle index f441634a..fcfbe6d1 100644 --- a/android/examples/radialblur/build.gradle +++ b/android/examples/radialblur/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/rayquery/build.gradle b/android/examples/rayquery/build.gradle index 24a12e97..75b084ca 100644 --- a/android/examples/rayquery/build.gradle +++ b/android/examples/rayquery/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/raytracingbasic/build.gradle b/android/examples/raytracingbasic/build.gradle index 754626cb..3e2cabc9 100644 --- a/android/examples/raytracingbasic/build.gradle +++ b/android/examples/raytracingbasic/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/raytracingreflections/build.gradle b/android/examples/raytracingreflections/build.gradle index 774854e5..55c50d32 100644 --- a/android/examples/raytracingreflections/build.gradle +++ b/android/examples/raytracingreflections/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/raytracingshadows/build.gradle b/android/examples/raytracingshadows/build.gradle index d36b99ec..e951cba9 100644 --- a/android/examples/raytracingshadows/build.gradle +++ b/android/examples/raytracingshadows/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/renderheadless/build.gradle b/android/examples/renderheadless/build.gradle index 3875de88..87bc76e8 100644 --- a/android/examples/renderheadless/build.gradle +++ b/android/examples/renderheadless/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/screenshot/build.gradle b/android/examples/screenshot/build.gradle index 27f10976..196a6aa9 100644 --- a/android/examples/screenshot/build.gradle +++ b/android/examples/screenshot/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/shadowmapping/build.gradle b/android/examples/shadowmapping/build.gradle index 6f633e70..e25b24a8 100644 --- a/android/examples/shadowmapping/build.gradle +++ b/android/examples/shadowmapping/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingcascade/build.gradle b/android/examples/shadowmappingcascade/build.gradle index fc472392..ce5064d5 100644 --- a/android/examples/shadowmappingcascade/build.gradle +++ b/android/examples/shadowmappingcascade/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingomni/build.gradle b/android/examples/shadowmappingomni/build.gradle index eda1c362..019a4341 100644 --- a/android/examples/shadowmappingomni/build.gradle +++ b/android/examples/shadowmappingomni/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/specializationconstants/build.gradle b/android/examples/specializationconstants/build.gradle index 3b56f7ae..c48bbd84 100644 --- a/android/examples/specializationconstants/build.gradle +++ b/android/examples/specializationconstants/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/sphericalenvmapping/build.gradle b/android/examples/sphericalenvmapping/build.gradle index 946c7592..e542ccd4 100644 --- a/android/examples/sphericalenvmapping/build.gradle +++ b/android/examples/sphericalenvmapping/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/ssao/build.gradle b/android/examples/ssao/build.gradle index 0f525e5e..d9f76090 100644 --- a/android/examples/ssao/build.gradle +++ b/android/examples/ssao/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/stencilbuffer/build.gradle b/android/examples/stencilbuffer/build.gradle index a3c732b4..10f97582 100644 --- a/android/examples/stencilbuffer/build.gradle +++ b/android/examples/stencilbuffer/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/subpasses/build.gradle b/android/examples/subpasses/build.gradle index 3332f2aa..9e83166d 100644 --- a/android/examples/subpasses/build.gradle +++ b/android/examples/subpasses/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/terraintessellation/build.gradle b/android/examples/terraintessellation/build.gradle index 3803f8af..4400df2d 100644 --- a/android/examples/terraintessellation/build.gradle +++ b/android/examples/terraintessellation/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/tessellation/build.gradle b/android/examples/tessellation/build.gradle index 9ee511e5..e60902a1 100644 --- a/android/examples/tessellation/build.gradle +++ b/android/examples/tessellation/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/textoverlay/build.gradle b/android/examples/textoverlay/build.gradle index 494beb0b..617bcc81 100644 --- a/android/examples/textoverlay/build.gradle +++ b/android/examples/textoverlay/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texture/build.gradle b/android/examples/texture/build.gradle index 388629e1..61f08645 100644 --- a/android/examples/texture/build.gradle +++ b/android/examples/texture/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texture3d/build.gradle b/android/examples/texture3d/build.gradle index a8c10459..9805bfa5 100644 --- a/android/examples/texture3d/build.gradle +++ b/android/examples/texture3d/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texturearray/build.gradle b/android/examples/texturearray/build.gradle index 39d3f977..90b528b2 100644 --- a/android/examples/texturearray/build.gradle +++ b/android/examples/texturearray/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemap/build.gradle b/android/examples/texturecubemap/build.gradle index 3da3cb5f..dbcfc8a9 100644 --- a/android/examples/texturecubemap/build.gradle +++ b/android/examples/texturecubemap/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemaparray/build.gradle b/android/examples/texturecubemaparray/build.gradle index 3cf57bfc..a9f68f4d 100644 --- a/android/examples/texturecubemaparray/build.gradle +++ b/android/examples/texturecubemaparray/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/texturemipmapgen/build.gradle b/android/examples/texturemipmapgen/build.gradle index 8c3e5f1f..8249c6a3 100644 --- a/android/examples/texturemipmapgen/build.gradle +++ b/android/examples/texturemipmapgen/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/triangle/build.gradle b/android/examples/triangle/build.gradle index ee7e8b4b..5412f397 100644 --- a/android/examples/triangle/build.gradle +++ b/android/examples/triangle/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/vertexattributes/build.gradle b/android/examples/vertexattributes/build.gradle index 5e7e253d..501ad04f 100644 --- a/android/examples/vertexattributes/build.gradle +++ b/android/examples/vertexattributes/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/viewportarray/build.gradle b/android/examples/viewportarray/build.gradle index 74def6e3..fe35d477 100644 --- a/android/examples/viewportarray/build.gradle +++ b/android/examples/viewportarray/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/examples/vulkanscene/build.gradle b/android/examples/vulkanscene/build.gradle index 6db1f1a0..3a0307a9 100644 --- a/android/examples/vulkanscene/build.gradle +++ b/android/examples/vulkanscene/build.gradle @@ -10,7 +10,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "arm64-v8a" + abiFilters rootProject.ext.abiFilters } externalNativeBuild { cmake { diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..d1e13c17 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,14 @@ +## For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# 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 +org.gradle.jvmargs=-Xmx4096M