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

Projucer: Update default Android SDK, adjust CMake flag specification

Browse source
This commit is contained in:
reuk 2022-08-31 14:21:10 +01:00
parent 72f6e84ca4
commit 1975bb7479
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
18 changed files with 82 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/DemoRunner/Builds/Android/app/CMakeLists.txt
View file

@ -1,8 +1,10 @@
# Automatically generated makefile, created by the Projucer
# Automatically generated CMakeLists, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!
cmake_minimum_required(VERSION 3.4.1)
project(juce_jni_project)
set(BINARY_NAME "juce_jni")
set(OBOE_DIR "../../../../../modules/juce_audio_devices/native/oboe")

16
examples/DemoRunner/Builds/Android/app/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 31
compileSdkVersion 33
externalNativeBuild {
cmake {
path "CMakeLists.txt"
@ -20,7 +20,7 @@ android {
defaultConfig {
applicationId "com.rmsl.jucedemorunner"
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
externalNativeBuild {
cmake {
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-23", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=14", "-DCMAKE_CXX_EXTENSIONS=OFF"
@ -51,21 +51,25 @@ android {
}
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
cFlags "-O0"
cppFlags "-O0"
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG"
}
}
dimension "default"
}
}
release_ {
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
cFlags "-O3"
cppFlags "-O3"
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE"
}
}
dimension "default"
}
}
}
variantFilter { variant ->

2
examples/DemoRunner/Builds/Android/build.gradle
View file

@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

2
examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

3
examples/DemoRunner/DemoRunner.jucer
View file

@ -91,8 +91,7 @@
<ANDROIDSTUDIO targetFolder="Builds/Android" androidMinimumSDK="23" microphonePermissionNeeded="1"
androidBluetoothNeeded="1" androidExternalReadNeeded="1" androidExternalWriteNeeded="1"
androidEnableContentSharing="1" androidExtraAssetsFolder="../Assets"
smallIcon="YyqWd2" bigIcon="YyqWd2" cameraPermissionNeeded="1"
androidTargetSDK="31">
smallIcon="YyqWd2" bigIcon="YyqWd2" cameraPermissionNeeded="1">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" recommendedWarnings="LLVM"/>
<CONFIGURATION isDebug="0" name="Release" recommendedWarnings="LLVM"/>

4
extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
View file

@ -1,8 +1,10 @@
# Automatically generated makefile, created by the Projucer
# Automatically generated CMakeLists, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!
cmake_minimum_required(VERSION 3.4.1)
project(juce_jni_project)
set(BINARY_NAME "juce_jni")
set(OBOE_DIR "../../../../../modules/juce_audio_devices/native/oboe")

16
extras/AudioPerformanceTest/Builds/Android/app/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
compileSdkVersion 33
externalNativeBuild {
cmake {
path "CMakeLists.txt"
@ -20,7 +20,7 @@ android {
defaultConfig {
applicationId "com.juce.audioperformancetest"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 33
externalNativeBuild {
cmake {
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-23", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=14", "-DCMAKE_CXX_EXTENSIONS=OFF"
@ -51,21 +51,25 @@ android {
}
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
cFlags "-O0"
cppFlags "-O0"
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG"
}
}
dimension "default"
}
}
release_ {
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-Ofast", "-DCMAKE_C_FLAGS_RELEASE=-Ofast"
cFlags "-Ofast"
cppFlags "-Ofast"
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE"
}
}
dimension "default"
}
}
}
variantFilter { variant ->

2
extras/AudioPerformanceTest/Builds/Android/build.gradle
View file

@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

2
extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

4
extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
View file

@ -1,8 +1,10 @@
# Automatically generated makefile, created by the Projucer
# Automatically generated CMakeLists, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!
cmake_minimum_required(VERSION 3.4.1)
project(juce_jni_project)
set(BINARY_NAME "juce_jni")
set(OBOE_DIR "../../../../../modules/juce_audio_devices/native/oboe")

16
extras/AudioPluginHost/Builds/Android/app/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
compileSdkVersion 33
externalNativeBuild {
cmake {
path "CMakeLists.txt"
@ -20,7 +20,7 @@ android {
defaultConfig {
applicationId "com.juce.pluginhost"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 33
externalNativeBuild {
cmake {
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-23", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=14", "-DCMAKE_CXX_EXTENSIONS=OFF"
@ -51,21 +51,25 @@ android {
}
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
cFlags "-O0"
cppFlags "-O0"
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG"
}
}
dimension "default"
}
}
release_ {
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
cFlags "-O3"
cppFlags "-O3"
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE"
}
}
dimension "default"
}
}
}
variantFilter { variant ->

2
extras/AudioPluginHost/Builds/Android/build.gradle
View file

@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

2
extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

4
extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
View file

@ -1,8 +1,10 @@
# Automatically generated makefile, created by the Projucer
# Automatically generated CMakeLists, created by the Projucer
# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!
cmake_minimum_required(VERSION 3.4.1)
project(juce_jni_project)
set(BINARY_NAME "juce_jni")
set(OBOE_DIR "../../../../../modules/juce_audio_devices/native/oboe")

16
extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 30
compileSdkVersion 33
externalNativeBuild {
cmake {
path "CMakeLists.txt"
@ -20,7 +20,7 @@ android {
defaultConfig {
applicationId "com.juce.networkgraphicsdemo"
minSdkVersion 16
targetSdkVersion 30
targetSdkVersion 33
externalNativeBuild {
cmake {
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-16", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=14", "-DCMAKE_CXX_EXTENSIONS=OFF"
@ -51,21 +51,25 @@ android {
}
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-Ofast", "-DCMAKE_C_FLAGS_DEBUG=-Ofast"
cFlags "-Ofast"
cppFlags "-Ofast"
arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG"
}
}
dimension "default"
}
}
release_ {
externalNativeBuild {
cmake {
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
cFlags "-O3"
cppFlags "-O3"
arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE"
}
}
dimension "default"
}
}
}
variantFilter { variant ->

2
extras/NetworkGraphicsDemo/Builds/Android/build.gradle
View file

@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

2
extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

47
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -116,7 +116,7 @@ public:
androidGradleSettingsContent (settings, Ids::androidGradleSettingsContent, getUndoManager()),
androidVersionCode (settings, Ids::androidVersionCode, getUndoManager(), "1"),
androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"),
androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "30"),
androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "33"),
androidTheme (settings, Ids::androidTheme, getUndoManager()),
androidExtraAssetsFolder (settings, Ids::androidExtraAssetsFolder, getUndoManager()),
androidOboeRepositoryPath (settings, Ids::androidOboeRepositoryPath, getUndoManager()),
@ -137,9 +137,9 @@ public:
androidKeyStorePass (settings, Ids::androidKeyStorePass, getUndoManager(), "android"),
androidKeyAlias (settings, Ids::androidKeyAlias, getUndoManager(), "androiddebugkey"),
androidKeyAliasPass (settings, Ids::androidKeyAliasPass, getUndoManager(), "android"),
gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.0.2"),
gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.5.1"),
gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"),
androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.0.0"),
androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.2.2"),
AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString())
{
name = getDisplayName();
@ -348,12 +348,14 @@ private:
{
mo.setNewLineString (getNewLineString());
mo << "# Automatically generated makefile, created by the Projucer" << newLine
mo << "# Automatically generated CMakeLists, created by the Projucer" << newLine
<< "# Don't edit this file! Your changes will be overwritten when you re-save the Projucer project!" << newLine
<< newLine
<< "cmake_minimum_required(VERSION 3.4.1)" << newLine
<< newLine
<< "project(juce_jni_project)" << newLine
<< newLine;
mo << "cmake_minimum_required(VERSION 3.4.1)" << newLine << newLine;
if (! isLibrary())
mo << "set(BINARY_NAME \"juce_jni\")" << newLine << newLine;
@ -677,32 +679,25 @@ private:
if (cfg.getArchitectures().isNotEmpty())
{
mo << " ndk {" << newLine;
mo << " abiFilters " << toGradleList (StringArray::fromTokens (cfg.getArchitectures(), " ", "")) << newLine;
mo << " }" << newLine;
mo << " ndk {" << newLine
<< " abiFilters " << toGradleList (StringArray::fromTokens (cfg.getArchitectures(), " ", "")) << newLine
<< " }" << newLine;
}
mo << " externalNativeBuild {" << newLine;
mo << " cmake {" << newLine;
mo << " externalNativeBuild {" << newLine
<< " cmake {" << newLine;
if (getProject().getProjectType().isStaticLibrary())
mo << " targets \"" << getNativeModuleBinaryName (cfg) << "\"" << newLine;
mo << " arguments "
<< "\"-DJUCE_BUILD_CONFIGURATION=" << cfg.getProductFlavourCMakeIdentifier() << "\"";
mo << ", \"-DCMAKE_CXX_FLAGS_" << (cfg.isDebug() ? "DEBUG" : "RELEASE")
<< "=-O" << cfg.getGCCOptimisationFlag();
mo << "\""
<< ", \"-DCMAKE_C_FLAGS_" << (cfg.isDebug() ? "DEBUG" : "RELEASE")
<< "=-O" << cfg.getGCCOptimisationFlag()
<< "\"" << newLine;
mo << " }" << newLine;
mo << " }" << newLine << newLine;
mo << " dimension \"default\"" << newLine;
mo << " }" << newLine;
mo << " cFlags \"-O" << cfg.getGCCOptimisationFlag() << "\"" << newLine
<< " cppFlags \"-O" << cfg.getGCCOptimisationFlag() << "\"" << newLine
<< " arguments \"-DJUCE_BUILD_CONFIGURATION=" << cfg.getProductFlavourCMakeIdentifier() << "\"" << newLine
<< " }" << newLine
<< " }" << newLine
<< newLine
<< " dimension \"default\"" << newLine
<< " }" << newLine;
}
mo << " }" << newLine;