1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

Android: Use default architectures for projects in extras

This commit is contained in:
Tom Poole 2022-07-06 11:29:20 +01:00
parent 975bdecae5
commit a72f508a47
6 changed files with 9 additions and 13 deletions

View file

@ -92,8 +92,8 @@
androidCpp11="1" targetFolder="Builds/Android" extraCompilerFlags="-mfpu=neon -mfloat-abi=hard -ffast-math -funroll-loops --param max-unroll-times=8 -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -DJUCE_DISABLE_ASSERTIONS=1"
gradleToolchainVersion="3.6" androidMinimumSDK="23">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" targetName="AudioPerformanceTest"/>
<CONFIGURATION name="Release" androidArchitectures="arm64-v8a" isDebug="0" optimisation="6"
<CONFIGURATION name="Debug" isDebug="1" targetName="AudioPerformanceTest"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="6"
targetName="AudioPerformanceTest"/>
</CONFIGURATIONS>
<MODULEPATHS>

View file

@ -47,7 +47,7 @@ android {
productFlavors {
debug_ {
ndk {
abiFilters "arm64-v8a"
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
externalNativeBuild {
cmake {
@ -58,9 +58,6 @@ android {
dimension "default"
}
release_ {
ndk {
abiFilters "arm64-v8a"
}
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-Ofast", "-DCMAKE_C_FLAGS_RELEASE=-Ofast"

View file

@ -153,9 +153,8 @@
microphonePermissionNeeded="1" androidBluetoothNeeded="1" smallIcon="c97aUr"
bigIcon="c97aUr" androidExtraAssetsFolder="../../examples/Assets">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi-v7a x86" isDebug="1"
optimisation="1" linkTimeOptimisation="0" targetName="Plugin Host"
recommendedWarnings="LLVM"/>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" linkTimeOptimisation="0"
targetName="Plugin Host" recommendedWarnings="LLVM"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" linkTimeOptimisation="1"
targetName="Plugin Host" recommendedWarnings="LLVM"/>
</CONFIGURATIONS>

View file

@ -47,7 +47,7 @@ android {
productFlavors {
debug_ {
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
externalNativeBuild {
cmake {

View file

@ -47,7 +47,7 @@ android {
productFlavors {
debug_ {
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
externalNativeBuild {
cmake {

View file

@ -111,8 +111,8 @@
androidCpp11="1" targetFolder="Builds/Android" bigIcon="Ww6bQw"
gradleToolchainVersion="3.6">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi-v7a x86" isDebug="1"
optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>
<CONFIGURATION name="Debug" isDebug="1" optimisation="6"
targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>
<CONFIGURATION name="Release" isDebug="0" targetName="JUCE Network Graphics Demo"/>
</CONFIGURATIONS>
<MODULEPATHS>