From 9578a603e8c12a5c98a09bce1eff717ecb1e14ae Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Sun, 28 May 2023 19:37:00 +0800 Subject: [PATCH 1/7] Increase the JVM heap size for Gradle [Why] The Java Virtual Machine(JVM) maximum heap size(-Xmx) is 512M by default. It will occur out of memory eror when compiling for Android. Android compiling error: "java.lang.OutOfMemoryError: Java heap space". [How] Configure JVM memory for Gradle by setting Gradle property org.gradle.jvmargs in gradle.properties file. This gradle.properties file was generated by Android Studio settings. Reference: https://developer.android.com/build/optimize-your-build?utm_source=android-studio#increase-the-jvm-heap-size https://docs.gradle.org/7.2/userguide/build_environment.html#sec:configuring_jvm_memory --- android/gradle.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 android/gradle.properties 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 From 5e24e0ca1598b6672d3659058d102a82b858bb41 Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Sun, 28 May 2023 19:18:19 +0800 Subject: [PATCH 2/7] Migrate jcenter to mavenCentral [Why] JFrog made JCenter a read-only repository on March 31, 2021. [How] Migrate JCenter to Maven Central. Reference: https://developer.android.com/build/jcenter-migration --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 556f4dd7..bb02bd45 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,7 +21,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } From 16da9abfd651a64a2eb6e183205811c7c8c66bfb Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Tue, 18 Apr 2023 11:27:19 +0800 Subject: [PATCH 3/7] Update BUILD.md for building on Android --- BUILD.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BUILD.md b/BUILD.md index ff2456d3..6be82957 100644 --- a/BUILD.md +++ b/BUILD.md @@ -23,7 +23,11 @@ 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/): +Set Android SDK/NDK by environment variable `ANDROID_SDK_ROOT`/`ANDROID_NDK_HOME`. + ``` +export ANDROID_SDK_ROOT= +export ANDROID_NDK_HOME= cd android ./gradlew assembleDebug ``` @@ -33,6 +37,8 @@ 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 ```android\build.gradle``` 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*. From 570d3fca81b28c5fab11ce30eb54147f3a64d169 Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Mon, 29 May 2023 16:13:10 +0800 Subject: [PATCH 4/7] Add x86_64 ABI support for Android [Why] In some case, people may need x86 ABI version apk if they develop on x86 Android. Support x86_64 ABI by default is better. [How] Add android::ndk::abiFilters property "x86_64". --- android/examples/_template/build.gradle | 2 +- android/examples/bloom/build.gradle | 2 +- android/examples/computecloth/build.gradle | 2 +- android/examples/computecullandlod/build.gradle | 2 +- android/examples/computeheadless/build.gradle | 2 +- android/examples/computenbody/build.gradle | 2 +- android/examples/computeparticles/build.gradle | 2 +- android/examples/computeraytracing/build.gradle | 2 +- android/examples/computeshader/build.gradle | 2 +- android/examples/conservativeraster/build.gradle | 2 +- android/examples/debugmarker/build.gradle | 2 +- android/examples/deferred/build.gradle | 2 +- android/examples/deferredmultisampling/build.gradle | 2 +- android/examples/deferredshadows/build.gradle | 2 +- android/examples/descriptorindexing/build.gradle | 2 +- android/examples/descriptorsets/build.gradle | 2 +- android/examples/displacement/build.gradle | 2 +- android/examples/distancefieldfonts/build.gradle | 2 +- android/examples/dynamicuniformbuffer/build.gradle | 2 +- android/examples/gears/build.gradle | 2 +- android/examples/geometryshader/build.gradle | 2 +- android/examples/gltfloading/build.gradle | 2 +- android/examples/gltfscenerendering/build.gradle | 2 +- android/examples/gltfskinning/build.gradle | 2 +- android/examples/hdr/build.gradle | 2 +- android/examples/imgui/build.gradle | 2 +- android/examples/indirectdraw/build.gradle | 2 +- android/examples/inlineuniformblocks/build.gradle | 2 +- android/examples/inputattachments/build.gradle | 2 +- android/examples/instancing/build.gradle | 2 +- android/examples/multisampling/build.gradle | 2 +- android/examples/multithreading/build.gradle | 2 +- android/examples/multiview/build.gradle | 2 +- android/examples/negativeviewportheight/build.gradle | 2 +- android/examples/occlusionquery/build.gradle | 2 +- android/examples/offscreen/build.gradle | 2 +- android/examples/oit/build.gradle | 2 +- android/examples/parallaxmapping/build.gradle | 2 +- android/examples/particlefire/build.gradle | 2 +- android/examples/pbrbasic/build.gradle | 2 +- android/examples/pbribl/build.gradle | 2 +- android/examples/pbrtexture/build.gradle | 2 +- android/examples/pipelines/build.gradle | 2 +- android/examples/pipelinestatistics/build.gradle | 2 +- android/examples/pushconstants/build.gradle | 2 +- android/examples/pushdescriptors/build.gradle | 2 +- android/examples/radialblur/build.gradle | 2 +- android/examples/rayquery/build.gradle | 2 +- android/examples/raytracingbasic/build.gradle | 2 +- android/examples/raytracingreflections/build.gradle | 2 +- android/examples/raytracingshadows/build.gradle | 2 +- android/examples/renderheadless/build.gradle | 2 +- android/examples/screenshot/build.gradle | 2 +- android/examples/shadowmapping/build.gradle | 2 +- android/examples/shadowmappingcascade/build.gradle | 2 +- android/examples/shadowmappingomni/build.gradle | 2 +- android/examples/specializationconstants/build.gradle | 2 +- android/examples/sphericalenvmapping/build.gradle | 2 +- android/examples/ssao/build.gradle | 2 +- android/examples/stencilbuffer/build.gradle | 2 +- android/examples/subpasses/build.gradle | 2 +- android/examples/terraintessellation/build.gradle | 2 +- android/examples/tessellation/build.gradle | 2 +- android/examples/textoverlay/build.gradle | 2 +- android/examples/texture/build.gradle | 2 +- android/examples/texture3d/build.gradle | 2 +- android/examples/texturearray/build.gradle | 2 +- android/examples/texturecubemap/build.gradle | 2 +- android/examples/texturecubemaparray/build.gradle | 2 +- android/examples/texturemipmapgen/build.gradle | 2 +- android/examples/triangle/build.gradle | 2 +- android/examples/vertexattributes/build.gradle | 2 +- android/examples/viewportarray/build.gradle | 2 +- android/examples/vulkanscene/build.gradle | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/android/examples/_template/build.gradle b/android/examples/_template/build.gradle index eefe2a55..a90fc28e 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/bloom/build.gradle b/android/examples/bloom/build.gradle index bed7c0c1..5fc73765 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computecloth/build.gradle b/android/examples/computecloth/build.gradle index 80d95ddd..72294c96 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computecullandlod/build.gradle b/android/examples/computecullandlod/build.gradle index 62eed3b7..7228c9a1 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computeheadless/build.gradle b/android/examples/computeheadless/build.gradle index 0e0536c8..55885e5d 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computenbody/build.gradle b/android/examples/computenbody/build.gradle index 6593d39f..525ca337 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computeparticles/build.gradle b/android/examples/computeparticles/build.gradle index bec13209..cfdcf46c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computeraytracing/build.gradle b/android/examples/computeraytracing/build.gradle index 215ecfb9..ade6708f 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/computeshader/build.gradle b/android/examples/computeshader/build.gradle index 50762a7c..7b0692e0 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/conservativeraster/build.gradle b/android/examples/conservativeraster/build.gradle index 9ba83feb..4c69c68a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/debugmarker/build.gradle b/android/examples/debugmarker/build.gradle index 668c14e8..36d27628 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/deferred/build.gradle b/android/examples/deferred/build.gradle index 175cb767..b5e8f320 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/deferredmultisampling/build.gradle b/android/examples/deferredmultisampling/build.gradle index 64d98426..cd11cc4a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/deferredshadows/build.gradle b/android/examples/deferredshadows/build.gradle index 9a69fc4a..370137ad 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/descriptorindexing/build.gradle b/android/examples/descriptorindexing/build.gradle index f61ed680..718a9ebc 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/descriptorsets/build.gradle b/android/examples/descriptorsets/build.gradle index b40fabc7..afa83704 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/displacement/build.gradle b/android/examples/displacement/build.gradle index 65f92506..9b94034c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/distancefieldfonts/build.gradle b/android/examples/distancefieldfonts/build.gradle index 6eccb50d..d9b8cbf4 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/dynamicuniformbuffer/build.gradle b/android/examples/dynamicuniformbuffer/build.gradle index f5bb1cfd..67603f4f 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/gears/build.gradle b/android/examples/gears/build.gradle index 66edd92b..5e74e866 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/geometryshader/build.gradle b/android/examples/geometryshader/build.gradle index ffae1b1d..f7588e6d 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/gltfloading/build.gradle b/android/examples/gltfloading/build.gradle index f475101c..4ebe1f5c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/gltfscenerendering/build.gradle b/android/examples/gltfscenerendering/build.gradle index 372031c2..15d0bf3a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/gltfskinning/build.gradle b/android/examples/gltfskinning/build.gradle index 4cbc9b59..93157d16 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/hdr/build.gradle b/android/examples/hdr/build.gradle index c3bd99c7..8acca9e4 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/imgui/build.gradle b/android/examples/imgui/build.gradle index 26cdc5a0..a7f71da9 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/indirectdraw/build.gradle b/android/examples/indirectdraw/build.gradle index 66d8d878..30ecec98 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/inlineuniformblocks/build.gradle b/android/examples/inlineuniformblocks/build.gradle index 8fdee692..dd084643 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/inputattachments/build.gradle b/android/examples/inputattachments/build.gradle index 1c70a375..64bef662 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/instancing/build.gradle b/android/examples/instancing/build.gradle index bd0c6a40..41470100 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/multisampling/build.gradle b/android/examples/multisampling/build.gradle index 8ac6bff1..84cb2e32 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/multithreading/build.gradle b/android/examples/multithreading/build.gradle index 1f2095ff..1f3e04bf 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/multiview/build.gradle b/android/examples/multiview/build.gradle index bb1eab8e..1c64582a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/negativeviewportheight/build.gradle b/android/examples/negativeviewportheight/build.gradle index 0c2f4225..3b9c0830 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/occlusionquery/build.gradle b/android/examples/occlusionquery/build.gradle index 377e190b..846bdfc2 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/offscreen/build.gradle b/android/examples/offscreen/build.gradle index cd3e30ec..3589c674 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/oit/build.gradle b/android/examples/oit/build.gradle index 88b97ce7..b6c1e68c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/parallaxmapping/build.gradle b/android/examples/parallaxmapping/build.gradle index d3b0000a..07960c1e 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/particlefire/build.gradle b/android/examples/particlefire/build.gradle index 63f628e6..45cc16b1 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pbrbasic/build.gradle b/android/examples/pbrbasic/build.gradle index 8b78a683..132be91d 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pbribl/build.gradle b/android/examples/pbribl/build.gradle index 62e8c402..e3a91187 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pbrtexture/build.gradle b/android/examples/pbrtexture/build.gradle index 7c1f45d8..863cf94f 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pipelines/build.gradle b/android/examples/pipelines/build.gradle index 39d4f4e5..3c49c820 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pipelinestatistics/build.gradle b/android/examples/pipelinestatistics/build.gradle index 7ce56487..4c378396 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pushconstants/build.gradle b/android/examples/pushconstants/build.gradle index 781404b1..4dbc5b99 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/pushdescriptors/build.gradle b/android/examples/pushdescriptors/build.gradle index d4cfa547..84e894d4 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/radialblur/build.gradle b/android/examples/radialblur/build.gradle index f441634a..3a035242 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/rayquery/build.gradle b/android/examples/rayquery/build.gradle index 24a12e97..ccd42f8a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingbasic/build.gradle b/android/examples/raytracingbasic/build.gradle index 754626cb..39627dfc 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingreflections/build.gradle b/android/examples/raytracingreflections/build.gradle index 774854e5..2b9a3dab 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingshadows/build.gradle b/android/examples/raytracingshadows/build.gradle index d36b99ec..eeff09a5 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/renderheadless/build.gradle b/android/examples/renderheadless/build.gradle index 3875de88..962a0a2d 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/screenshot/build.gradle b/android/examples/screenshot/build.gradle index 27f10976..8aeb8199 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmapping/build.gradle b/android/examples/shadowmapping/build.gradle index 6f633e70..6a06ee82 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingcascade/build.gradle b/android/examples/shadowmappingcascade/build.gradle index fc472392..5295085c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingomni/build.gradle b/android/examples/shadowmappingomni/build.gradle index eda1c362..4c9eafeb 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/specializationconstants/build.gradle b/android/examples/specializationconstants/build.gradle index 3b56f7ae..4388f7e6 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/sphericalenvmapping/build.gradle b/android/examples/sphericalenvmapping/build.gradle index 946c7592..98eaf5f5 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/ssao/build.gradle b/android/examples/ssao/build.gradle index 0f525e5e..eeb4a94d 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/stencilbuffer/build.gradle b/android/examples/stencilbuffer/build.gradle index a3c732b4..ae6dfdc3 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/subpasses/build.gradle b/android/examples/subpasses/build.gradle index 3332f2aa..e29463a6 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/terraintessellation/build.gradle b/android/examples/terraintessellation/build.gradle index 3803f8af..fe7bf9ae 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/tessellation/build.gradle b/android/examples/tessellation/build.gradle index 9ee511e5..09b6a76a 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/textoverlay/build.gradle b/android/examples/textoverlay/build.gradle index 494beb0b..3d74f6a0 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texture/build.gradle b/android/examples/texture/build.gradle index 388629e1..cde082d1 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texture3d/build.gradle b/android/examples/texture3d/build.gradle index a8c10459..ad11e716 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texturearray/build.gradle b/android/examples/texturearray/build.gradle index 39d3f977..ed48bbaf 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemap/build.gradle b/android/examples/texturecubemap/build.gradle index 3da3cb5f..4909aaf5 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemaparray/build.gradle b/android/examples/texturecubemaparray/build.gradle index 3cf57bfc..0614a526 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/texturemipmapgen/build.gradle b/android/examples/texturemipmapgen/build.gradle index 8c3e5f1f..908ab8f2 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/triangle/build.gradle b/android/examples/triangle/build.gradle index ee7e8b4b..7c258b20 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/vertexattributes/build.gradle b/android/examples/vertexattributes/build.gradle index 5e7e253d..e8765ccd 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/viewportarray/build.gradle b/android/examples/viewportarray/build.gradle index 74def6e3..5ccd236c 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { diff --git a/android/examples/vulkanscene/build.gradle b/android/examples/vulkanscene/build.gradle index 6db1f1a0..833eb217 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 "arm64-v8a", "x86_64" } externalNativeBuild { cmake { From 495b3eba96e3bcb39dca5ffbc832e01484ab45ef Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Tue, 30 May 2023 13:59:20 +0800 Subject: [PATCH 5/7] Revert "Add x86_64 ABI support for Android" This reverts commit 570d3fca81b28c5fab11ce30eb54147f3a64d169. --- android/examples/_template/build.gradle | 2 +- android/examples/bloom/build.gradle | 2 +- android/examples/computecloth/build.gradle | 2 +- android/examples/computecullandlod/build.gradle | 2 +- android/examples/computeheadless/build.gradle | 2 +- android/examples/computenbody/build.gradle | 2 +- android/examples/computeparticles/build.gradle | 2 +- android/examples/computeraytracing/build.gradle | 2 +- android/examples/computeshader/build.gradle | 2 +- android/examples/conservativeraster/build.gradle | 2 +- android/examples/debugmarker/build.gradle | 2 +- android/examples/deferred/build.gradle | 2 +- android/examples/deferredmultisampling/build.gradle | 2 +- android/examples/deferredshadows/build.gradle | 2 +- android/examples/descriptorindexing/build.gradle | 2 +- android/examples/descriptorsets/build.gradle | 2 +- android/examples/displacement/build.gradle | 2 +- android/examples/distancefieldfonts/build.gradle | 2 +- android/examples/dynamicuniformbuffer/build.gradle | 2 +- android/examples/gears/build.gradle | 2 +- android/examples/geometryshader/build.gradle | 2 +- android/examples/gltfloading/build.gradle | 2 +- android/examples/gltfscenerendering/build.gradle | 2 +- android/examples/gltfskinning/build.gradle | 2 +- android/examples/hdr/build.gradle | 2 +- android/examples/imgui/build.gradle | 2 +- android/examples/indirectdraw/build.gradle | 2 +- android/examples/inlineuniformblocks/build.gradle | 2 +- android/examples/inputattachments/build.gradle | 2 +- android/examples/instancing/build.gradle | 2 +- android/examples/multisampling/build.gradle | 2 +- android/examples/multithreading/build.gradle | 2 +- android/examples/multiview/build.gradle | 2 +- android/examples/negativeviewportheight/build.gradle | 2 +- android/examples/occlusionquery/build.gradle | 2 +- android/examples/offscreen/build.gradle | 2 +- android/examples/oit/build.gradle | 2 +- android/examples/parallaxmapping/build.gradle | 2 +- android/examples/particlefire/build.gradle | 2 +- android/examples/pbrbasic/build.gradle | 2 +- android/examples/pbribl/build.gradle | 2 +- android/examples/pbrtexture/build.gradle | 2 +- android/examples/pipelines/build.gradle | 2 +- android/examples/pipelinestatistics/build.gradle | 2 +- android/examples/pushconstants/build.gradle | 2 +- android/examples/pushdescriptors/build.gradle | 2 +- android/examples/radialblur/build.gradle | 2 +- android/examples/rayquery/build.gradle | 2 +- android/examples/raytracingbasic/build.gradle | 2 +- android/examples/raytracingreflections/build.gradle | 2 +- android/examples/raytracingshadows/build.gradle | 2 +- android/examples/renderheadless/build.gradle | 2 +- android/examples/screenshot/build.gradle | 2 +- android/examples/shadowmapping/build.gradle | 2 +- android/examples/shadowmappingcascade/build.gradle | 2 +- android/examples/shadowmappingomni/build.gradle | 2 +- android/examples/specializationconstants/build.gradle | 2 +- android/examples/sphericalenvmapping/build.gradle | 2 +- android/examples/ssao/build.gradle | 2 +- android/examples/stencilbuffer/build.gradle | 2 +- android/examples/subpasses/build.gradle | 2 +- android/examples/terraintessellation/build.gradle | 2 +- android/examples/tessellation/build.gradle | 2 +- android/examples/textoverlay/build.gradle | 2 +- android/examples/texture/build.gradle | 2 +- android/examples/texture3d/build.gradle | 2 +- android/examples/texturearray/build.gradle | 2 +- android/examples/texturecubemap/build.gradle | 2 +- android/examples/texturecubemaparray/build.gradle | 2 +- android/examples/texturemipmapgen/build.gradle | 2 +- android/examples/triangle/build.gradle | 2 +- android/examples/vertexattributes/build.gradle | 2 +- android/examples/viewportarray/build.gradle | 2 +- android/examples/vulkanscene/build.gradle | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/android/examples/_template/build.gradle b/android/examples/_template/build.gradle index a90fc28e..eefe2a55 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/bloom/build.gradle b/android/examples/bloom/build.gradle index 5fc73765..bed7c0c1 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computecloth/build.gradle b/android/examples/computecloth/build.gradle index 72294c96..80d95ddd 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computecullandlod/build.gradle b/android/examples/computecullandlod/build.gradle index 7228c9a1..62eed3b7 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computeheadless/build.gradle b/android/examples/computeheadless/build.gradle index 55885e5d..0e0536c8 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computenbody/build.gradle b/android/examples/computenbody/build.gradle index 525ca337..6593d39f 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computeparticles/build.gradle b/android/examples/computeparticles/build.gradle index cfdcf46c..bec13209 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computeraytracing/build.gradle b/android/examples/computeraytracing/build.gradle index ade6708f..215ecfb9 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/computeshader/build.gradle b/android/examples/computeshader/build.gradle index 7b0692e0..50762a7c 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/conservativeraster/build.gradle b/android/examples/conservativeraster/build.gradle index 4c69c68a..9ba83feb 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/debugmarker/build.gradle b/android/examples/debugmarker/build.gradle index 36d27628..668c14e8 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/deferred/build.gradle b/android/examples/deferred/build.gradle index b5e8f320..175cb767 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/deferredmultisampling/build.gradle b/android/examples/deferredmultisampling/build.gradle index cd11cc4a..64d98426 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/deferredshadows/build.gradle b/android/examples/deferredshadows/build.gradle index 370137ad..9a69fc4a 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/descriptorindexing/build.gradle b/android/examples/descriptorindexing/build.gradle index 718a9ebc..f61ed680 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/descriptorsets/build.gradle b/android/examples/descriptorsets/build.gradle index afa83704..b40fabc7 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/displacement/build.gradle b/android/examples/displacement/build.gradle index 9b94034c..65f92506 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/distancefieldfonts/build.gradle b/android/examples/distancefieldfonts/build.gradle index d9b8cbf4..6eccb50d 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/dynamicuniformbuffer/build.gradle b/android/examples/dynamicuniformbuffer/build.gradle index 67603f4f..f5bb1cfd 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/gears/build.gradle b/android/examples/gears/build.gradle index 5e74e866..66edd92b 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/geometryshader/build.gradle b/android/examples/geometryshader/build.gradle index f7588e6d..ffae1b1d 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/gltfloading/build.gradle b/android/examples/gltfloading/build.gradle index 4ebe1f5c..f475101c 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/gltfscenerendering/build.gradle b/android/examples/gltfscenerendering/build.gradle index 15d0bf3a..372031c2 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/gltfskinning/build.gradle b/android/examples/gltfskinning/build.gradle index 93157d16..4cbc9b59 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/hdr/build.gradle b/android/examples/hdr/build.gradle index 8acca9e4..c3bd99c7 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/imgui/build.gradle b/android/examples/imgui/build.gradle index a7f71da9..26cdc5a0 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/indirectdraw/build.gradle b/android/examples/indirectdraw/build.gradle index 30ecec98..66d8d878 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/inlineuniformblocks/build.gradle b/android/examples/inlineuniformblocks/build.gradle index dd084643..8fdee692 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/inputattachments/build.gradle b/android/examples/inputattachments/build.gradle index 64bef662..1c70a375 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/instancing/build.gradle b/android/examples/instancing/build.gradle index 41470100..bd0c6a40 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/multisampling/build.gradle b/android/examples/multisampling/build.gradle index 84cb2e32..8ac6bff1 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/multithreading/build.gradle b/android/examples/multithreading/build.gradle index 1f3e04bf..1f2095ff 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/multiview/build.gradle b/android/examples/multiview/build.gradle index 1c64582a..bb1eab8e 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/negativeviewportheight/build.gradle b/android/examples/negativeviewportheight/build.gradle index 3b9c0830..0c2f4225 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/occlusionquery/build.gradle b/android/examples/occlusionquery/build.gradle index 846bdfc2..377e190b 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/offscreen/build.gradle b/android/examples/offscreen/build.gradle index 3589c674..cd3e30ec 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/oit/build.gradle b/android/examples/oit/build.gradle index b6c1e68c..88b97ce7 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/parallaxmapping/build.gradle b/android/examples/parallaxmapping/build.gradle index 07960c1e..d3b0000a 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/particlefire/build.gradle b/android/examples/particlefire/build.gradle index 45cc16b1..63f628e6 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pbrbasic/build.gradle b/android/examples/pbrbasic/build.gradle index 132be91d..8b78a683 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pbribl/build.gradle b/android/examples/pbribl/build.gradle index e3a91187..62e8c402 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pbrtexture/build.gradle b/android/examples/pbrtexture/build.gradle index 863cf94f..7c1f45d8 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pipelines/build.gradle b/android/examples/pipelines/build.gradle index 3c49c820..39d4f4e5 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pipelinestatistics/build.gradle b/android/examples/pipelinestatistics/build.gradle index 4c378396..7ce56487 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pushconstants/build.gradle b/android/examples/pushconstants/build.gradle index 4dbc5b99..781404b1 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/pushdescriptors/build.gradle b/android/examples/pushdescriptors/build.gradle index 84e894d4..d4cfa547 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/radialblur/build.gradle b/android/examples/radialblur/build.gradle index 3a035242..f441634a 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/rayquery/build.gradle b/android/examples/rayquery/build.gradle index ccd42f8a..24a12e97 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingbasic/build.gradle b/android/examples/raytracingbasic/build.gradle index 39627dfc..754626cb 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingreflections/build.gradle b/android/examples/raytracingreflections/build.gradle index 2b9a3dab..774854e5 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/raytracingshadows/build.gradle b/android/examples/raytracingshadows/build.gradle index eeff09a5..d36b99ec 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/renderheadless/build.gradle b/android/examples/renderheadless/build.gradle index 962a0a2d..3875de88 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/screenshot/build.gradle b/android/examples/screenshot/build.gradle index 8aeb8199..27f10976 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmapping/build.gradle b/android/examples/shadowmapping/build.gradle index 6a06ee82..6f633e70 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingcascade/build.gradle b/android/examples/shadowmappingcascade/build.gradle index 5295085c..fc472392 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/shadowmappingomni/build.gradle b/android/examples/shadowmappingomni/build.gradle index 4c9eafeb..eda1c362 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/specializationconstants/build.gradle b/android/examples/specializationconstants/build.gradle index 4388f7e6..3b56f7ae 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/sphericalenvmapping/build.gradle b/android/examples/sphericalenvmapping/build.gradle index 98eaf5f5..946c7592 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/ssao/build.gradle b/android/examples/ssao/build.gradle index eeb4a94d..0f525e5e 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/stencilbuffer/build.gradle b/android/examples/stencilbuffer/build.gradle index ae6dfdc3..a3c732b4 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/subpasses/build.gradle b/android/examples/subpasses/build.gradle index e29463a6..3332f2aa 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/terraintessellation/build.gradle b/android/examples/terraintessellation/build.gradle index fe7bf9ae..3803f8af 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/tessellation/build.gradle b/android/examples/tessellation/build.gradle index 09b6a76a..9ee511e5 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/textoverlay/build.gradle b/android/examples/textoverlay/build.gradle index 3d74f6a0..494beb0b 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texture/build.gradle b/android/examples/texture/build.gradle index cde082d1..388629e1 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texture3d/build.gradle b/android/examples/texture3d/build.gradle index ad11e716..a8c10459 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texturearray/build.gradle b/android/examples/texturearray/build.gradle index ed48bbaf..39d3f977 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemap/build.gradle b/android/examples/texturecubemap/build.gradle index 4909aaf5..3da3cb5f 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texturecubemaparray/build.gradle b/android/examples/texturecubemaparray/build.gradle index 0614a526..3cf57bfc 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/texturemipmapgen/build.gradle b/android/examples/texturemipmapgen/build.gradle index 908ab8f2..8c3e5f1f 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/triangle/build.gradle b/android/examples/triangle/build.gradle index 7c258b20..ee7e8b4b 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/vertexattributes/build.gradle b/android/examples/vertexattributes/build.gradle index e8765ccd..5e7e253d 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/viewportarray/build.gradle b/android/examples/viewportarray/build.gradle index 5ccd236c..74def6e3 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { diff --git a/android/examples/vulkanscene/build.gradle b/android/examples/vulkanscene/build.gradle index 833eb217..6db1f1a0 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", "x86_64" + abiFilters "arm64-v8a" } externalNativeBuild { cmake { From 71b5d83525aa3c4d55fab1dcc4ac490156d8ad04 Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Tue, 30 May 2023 15:01:07 +0800 Subject: [PATCH 6/7] Set abiFilters via global variable in settings.gradle --- android/build.gradle | 1 + android/examples/_template/build.gradle | 2 +- android/examples/bloom/build.gradle | 2 +- android/examples/computecloth/build.gradle | 2 +- android/examples/computecullandlod/build.gradle | 2 +- android/examples/computeheadless/build.gradle | 2 +- android/examples/computenbody/build.gradle | 2 +- android/examples/computeparticles/build.gradle | 2 +- android/examples/computeraytracing/build.gradle | 2 +- android/examples/computeshader/build.gradle | 2 +- android/examples/conservativeraster/build.gradle | 2 +- android/examples/debugmarker/build.gradle | 2 +- android/examples/deferred/build.gradle | 2 +- android/examples/deferredmultisampling/build.gradle | 2 +- android/examples/deferredshadows/build.gradle | 2 +- android/examples/descriptorindexing/build.gradle | 2 +- android/examples/descriptorsets/build.gradle | 2 +- android/examples/displacement/build.gradle | 2 +- android/examples/distancefieldfonts/build.gradle | 2 +- android/examples/dynamicuniformbuffer/build.gradle | 2 +- android/examples/gears/build.gradle | 2 +- android/examples/geometryshader/build.gradle | 2 +- android/examples/gltfloading/build.gradle | 2 +- android/examples/gltfscenerendering/build.gradle | 2 +- android/examples/gltfskinning/build.gradle | 2 +- android/examples/hdr/build.gradle | 2 +- android/examples/imgui/build.gradle | 2 +- android/examples/indirectdraw/build.gradle | 2 +- android/examples/inlineuniformblocks/build.gradle | 2 +- android/examples/inputattachments/build.gradle | 2 +- android/examples/instancing/build.gradle | 2 +- android/examples/multisampling/build.gradle | 2 +- android/examples/multithreading/build.gradle | 2 +- android/examples/multiview/build.gradle | 2 +- android/examples/negativeviewportheight/build.gradle | 2 +- android/examples/occlusionquery/build.gradle | 2 +- android/examples/offscreen/build.gradle | 2 +- android/examples/oit/build.gradle | 2 +- android/examples/parallaxmapping/build.gradle | 2 +- android/examples/particlefire/build.gradle | 2 +- android/examples/pbrbasic/build.gradle | 2 +- android/examples/pbribl/build.gradle | 2 +- android/examples/pbrtexture/build.gradle | 2 +- android/examples/pipelines/build.gradle | 2 +- android/examples/pipelinestatistics/build.gradle | 2 +- android/examples/pushconstants/build.gradle | 2 +- android/examples/pushdescriptors/build.gradle | 2 +- android/examples/radialblur/build.gradle | 2 +- android/examples/rayquery/build.gradle | 2 +- android/examples/raytracingbasic/build.gradle | 2 +- android/examples/raytracingreflections/build.gradle | 2 +- android/examples/raytracingshadows/build.gradle | 2 +- android/examples/renderheadless/build.gradle | 2 +- android/examples/screenshot/build.gradle | 2 +- android/examples/shadowmapping/build.gradle | 2 +- android/examples/shadowmappingcascade/build.gradle | 2 +- android/examples/shadowmappingomni/build.gradle | 2 +- android/examples/specializationconstants/build.gradle | 2 +- android/examples/sphericalenvmapping/build.gradle | 2 +- android/examples/ssao/build.gradle | 2 +- android/examples/stencilbuffer/build.gradle | 2 +- android/examples/subpasses/build.gradle | 2 +- android/examples/terraintessellation/build.gradle | 2 +- android/examples/tessellation/build.gradle | 2 +- android/examples/textoverlay/build.gradle | 2 +- android/examples/texture/build.gradle | 2 +- android/examples/texture3d/build.gradle | 2 +- android/examples/texturearray/build.gradle | 2 +- android/examples/texturecubemap/build.gradle | 2 +- android/examples/texturecubemaparray/build.gradle | 2 +- android/examples/texturemipmapgen/build.gradle | 2 +- android/examples/triangle/build.gradle | 2 +- android/examples/vertexattributes/build.gradle | 2 +- android/examples/viewportarray/build.gradle | 2 +- android/examples/vulkanscene/build.gradle | 2 +- 75 files changed, 75 insertions(+), 74 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index bb02bd45..7588f7fb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,6 +26,7 @@ allprojects { } 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 { From d7e42983a90e6ed1ce12000830767cfafc7337c1 Mon Sep 17 00:00:00 2001 From: robotchaoX Date: Fri, 9 Jun 2023 13:22:48 +0800 Subject: [PATCH 7/7] Modify BUILD.md for building on Android --- BUILD.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BUILD.md b/BUILD.md index 6be82957..173874ae 100644 --- a/BUILD.md +++ b/BUILD.md @@ -23,21 +23,21 @@ 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/): -Set Android SDK/NDK by environment variable `ANDROID_SDK_ROOT`/`ANDROID_NDK_HOME`. +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: ``` -export ANDROID_SDK_ROOT= -export ANDROID_NDK_HOME= 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 ```android\build.gradle``` in Android Studio. +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/)