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

Android Studio exporter: changed default toolchain back to clang (works again after Android Studio issue 207585 has been fixed in gradle-experimental wrapper version 0.7.0-rc1, and is the toolchain recommended by Google).

Browse source
This commit is contained in:
Timur Doumler 2016-04-29 10:54:17 +01:00
parent 0162c975dc
commit 908e1e93b9
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/Demo/JuceDemo.jucer
View file

@ -193,8 +193,8 @@
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1"
androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
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>
<CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
targetName="JuceDemo"/>

3
examples/MidiTest/MidiTest.jucer
View file

@ -102,7 +102,8 @@
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0"
androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified"
targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
androidMicNeeded="1" gradleToolchain="gcc" gradleToolchainVersion="3.6">
androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"
buildToolsVersion="23.0.1">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="1" targetName="MidiTest"/>

4
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
View file

@ -115,8 +115,8 @@
<ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
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>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>

4
examples/OSCReceiver/OSCReceiver.jucer
View file

@ -85,8 +85,8 @@
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified"
gradleToolchain="gcc" gradleToolchainVersion="3.6" androidSDKPath=""
androidNDKPath="">
gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"
androidSDKPath="" androidNDKPath="">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="1" targetName="OSCReceiver"/>

2
examples/OSCSender/OSCSender.jucer
View file

@ -77,7 +77,7 @@
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1"
androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio"
androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified"
gradleToolchain="gcc" gradleToolchainVersion="3.6">
gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="1" targetName="OSCSender"/>

4
extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h
View file

@ -52,8 +52,8 @@ public:
: AndroidProjectExporterBase (p, t),
gradleVersion (settings, Ids::gradleVersion, nullptr, "2.10"),
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())
{
name = getName();