| @@ -193,8 +193,8 @@ | |||||
| <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1" | <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1" | ||||
| androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath="" | androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath="" | ||||
| androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d" | androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d" | ||||
| androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="gcc" | |||||
| gradleToolchainVersion="3.6" androidTheme="@android:style/Theme.NoTitleBar"> | |||||
| androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang" | |||||
| gradleToolchainVersion="3.6" buildToolsVersion="23.0.1" androidTheme="@android:style/Theme.NoTitleBar"> | |||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1" | <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1" | ||||
| targetName="JuceDemo"/> | targetName="JuceDemo"/> | ||||
| @@ -102,7 +102,8 @@ | |||||
| <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0" | <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0" | ||||
| androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified" | androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified" | ||||
| targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" | targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" | ||||
| androidMicNeeded="1" gradleToolchain="gcc" gradleToolchainVersion="3.6"> | |||||
| androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6" | |||||
| buildToolsVersion="23.0.1"> | |||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | ||||
| optimisation="1" targetName="MidiTest"/> | optimisation="1" targetName="MidiTest"/> | ||||
| @@ -115,8 +115,8 @@ | |||||
| <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo" | <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo" | ||||
| androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" | androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" | ||||
| targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" | targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" | ||||
| bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="gcc" | |||||
| gradleToolchainVersion="3.6"> | |||||
| bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang" | |||||
| gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"> | |||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | ||||
| optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/> | optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/> | ||||
| @@ -85,8 +85,8 @@ | |||||
| <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver" | <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver" | ||||
| androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" | androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" | ||||
| targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" | targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" | ||||
| gradleToolchain="gcc" gradleToolchainVersion="3.6" androidSDKPath="" | |||||
| androidNDKPath=""> | |||||
| gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1" | |||||
| androidSDKPath="" androidNDKPath=""> | |||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | ||||
| optimisation="1" targetName="OSCReceiver"/> | optimisation="1" targetName="OSCReceiver"/> | ||||
| @@ -77,7 +77,7 @@ | |||||
| <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1" | <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1" | ||||
| androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio" | androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio" | ||||
| androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified" | androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified" | ||||
| gradleToolchain="gcc" gradleToolchainVersion="3.6"> | |||||
| gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"> | |||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" | ||||
| optimisation="1" targetName="OSCSender"/> | optimisation="1" targetName="OSCSender"/> | ||||
| @@ -52,8 +52,8 @@ public: | |||||
| : AndroidProjectExporterBase (p, t), | : AndroidProjectExporterBase (p, t), | ||||
| gradleVersion (settings, Ids::gradleVersion, nullptr, "2.10"), | gradleVersion (settings, Ids::gradleVersion, nullptr, "2.10"), | ||||
| gradleWrapperVersion (settings, Ids::gradleWrapperVersion, nullptr, "0.7.0-rc1"), | gradleWrapperVersion (settings, Ids::gradleWrapperVersion, nullptr, "0.7.0-rc1"), | ||||
| gradleToolchain (settings, Ids::gradleToolchain, nullptr, "gcc"), | |||||
| buildToolsVersion (settings, Ids::buildToolsVersion, nullptr, "23.0.2"), | |||||
| gradleToolchain (settings, Ids::gradleToolchain, nullptr, "clang"), | |||||
| buildToolsVersion (settings, Ids::buildToolsVersion, nullptr, "23.0.3"), | |||||
| androidStudioExecutable (findAndroidStudioExecutable()) | androidStudioExecutable (findAndroidStudioExecutable()) | ||||
| { | { | ||||
| name = getName(); | name = getName(); | ||||