From 908e1e93b9daa729b6f8a8ff10f2f540ac14ce72 Mon Sep 17 00:00:00 2001
From: Timur Doumler <timur@roli.com>
Date: Fri, 29 Apr 2016 10:54:17 +0100
Subject: [PATCH] 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).

---
 examples/Demo/JuceDemo.jucer                                  | 4 ++--
 examples/MidiTest/MidiTest.jucer                              | 3 ++-
 examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer        | 4 ++--
 examples/OSCReceiver/OSCReceiver.jucer                        | 4 ++--
 examples/OSCSender/OSCSender.jucer                            | 2 +-
 .../Source/Project Saving/jucer_ProjectExport_AndroidStudio.h | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer
index 420bc5479f..cee04d3f18 100644
--- a/examples/Demo/JuceDemo.jucer
+++ b/examples/Demo/JuceDemo.jucer
@@ -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"/>
diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer
index cf99e64d20..7fdcf365e3 100644
--- a/examples/MidiTest/MidiTest.jucer
+++ b/examples/MidiTest/MidiTest.jucer
@@ -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"/>
diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
index d0dac9a66e..e916192677 100644
--- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
+++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
@@ -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"/>
diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer
index 24f69d2780..c65600d003 100644
--- a/examples/OSCReceiver/OSCReceiver.jucer
+++ b/examples/OSCReceiver/OSCReceiver.jucer
@@ -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"/>
diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer
index 09d445cf11..5cc329c2f0 100644
--- a/examples/OSCSender/OSCSender.jucer
+++ b/examples/OSCSender/OSCSender.jucer
@@ -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"/>
diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h
index 974bed16e8..1e6d145b2a 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
@@ -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();