From 28dccb31bb53ee191f5cac32deaf893351dd7728 Mon Sep 17 00:00:00 2001
From: hogliux <fabian.renn@gmail.com>
Date: Wed, 1 Feb 2017 16:27:41 +0000
Subject: [PATCH] Removed old Android exporters from examples and updated
 .gitignore to reflect new Android build folder structure

---
 .gitignore                                    | 10 ++---
 examples/Demo/JuceDemo.jucer                  | 37 ++-----------------
 examples/MidiTest/MidiTest.jucer              |  9 +++--
 .../NetworkGraphicsDemo.jucer                 |  6 +--
 examples/OSCReceiver/OSCReceiver.jucer        |  8 ++--
 examples/OSCSender/OSCSender.jucer            |  6 +--
 .../AudioPerformanceTest.jucer                |  4 +-
 7 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbfad773b1..9d443fb4f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,15 +43,15 @@ profile
 **/VisualStudio2015/Debug
 **/VisualStudio2015/Release
 **/VisualStudio2015/x64
-**/Android/bin
-**/Android/libs
-**/Android/gen
-**/Android/obj
 **/CodeBlocks/bin
 **/CodeBlocks/obj
 **/CodeBlocks/*.depend
 **/CodeBlocks/*.layout
-**/Builds/AndroidStudio
+**/Builds/Android/.gradle
+**/Builds/Android/app/build
+**/Builds/Android/app/.externalNativeBuild
+**/Builds/Android/lib/build
+**/Builds/Android/lib/.externalNativeBuild
 **/doxygen/doc
 **/doxygen/build
 extras/Projucer/JUCECompileEngine.dylib
diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer
index 238e5650e7..dc094a91a9 100644
--- a/examples/Demo/JuceDemo.jucer
+++ b/examples/Demo/JuceDemo.jucer
@@ -164,45 +164,16 @@
         <MODULEPATH id="juce_audio_basics" path="../../modules"/>
       </MODULEPATHS>
     </VS2015>
-    <ANDROID targetFolder="Builds/Android" androidActivityClass="com.juce.jucedemo.JuceDemo"
-             androidSDKPath="" androidNDKPath="" androidInternetNeeded="1"
-             androidMicNeeded="1" bigIcon="xycKOk" androidCpp11="1" smallIcon="BvyE0d"
-             androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar"
-             androidScreenOrientation="unspecified">
-      <CONFIGURATIONS>
-        <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
-                       targetName="JuceDemo"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="JuceDemo"/>
-      </CONFIGURATIONS>
-      <MODULEPATHS>
-        <MODULEPATH id="juce_video" path="../../modules"/>
-        <MODULEPATH id="juce_opengl" path="../../modules"/>
-        <MODULEPATH id="juce_gui_extra" path="../../modules"/>
-        <MODULEPATH id="juce_gui_basics" path="../../modules"/>
-        <MODULEPATH id="juce_graphics" path="../../modules"/>
-        <MODULEPATH id="juce_events" path="../../modules"/>
-        <MODULEPATH id="juce_data_structures" path="../../modules"/>
-        <MODULEPATH id="juce_cryptography" path="../../modules"/>
-        <MODULEPATH id="juce_core" path="../../modules"/>
-        <MODULEPATH id="juce_audio_utils" path="../../modules"/>
-        <MODULEPATH id="juce_audio_processors" path="../../modules"/>
-        <MODULEPATH id="juce_audio_formats" path="../../modules"/>
-        <MODULEPATH id="juce_audio_devices" path="../../modules"/>
-        <MODULEPATH id="juce_audio_basics" path="../../modules"/>
-        <MODULEPATH id="juce_box2d" path="../../modules"/>
-      </MODULEPATHS>
-    </ANDROID>
     <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1"
-                   androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
-                   androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d"
+                   androidCpp11="1" targetFolder="Builds/Android" androidSDKPath=""
+                   androidNDKPath="" androidBluetoothNeeded="0" bigIcon="BvyE0d"
                    androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang"
                    gradleToolchainVersion="3.6" androidTheme="@android:style/Theme.NoTitleBar">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
                        targetName="JuceDemo"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="JuceDemo"/>
+        <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
+                       targetName="JuceDemo"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_video" path="../../modules"/>
diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer
index fd0ad705e5..2af47f41de 100644
--- a/examples/MidiTest/MidiTest.jucer
+++ b/examples/MidiTest/MidiTest.jucer
@@ -101,13 +101,14 @@
     </XCODE_IPHONE>
     <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0"
                    androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified"
-                   targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
-                   androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6">
+                   targetFolder="Builds/Android" androidSDKPath="" androidNDKPath=""
+                   androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"
+                   androidMinimumSDK="23">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="1" targetName="MidiTest"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="MidiTest"/>
+        <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
+                       targetName="MidiTest"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_gui_extra" path="../../modules"/>
diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
index 63be54ab68..ce3b7993bf 100644
--- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
+++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
@@ -114,14 +114,14 @@
     </LINUX_MAKE>
     <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
                    androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
-                   targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
+                   targetFolder="Builds/Android" androidSDKPath="" androidNDKPath=""
                    bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang"
                    gradleToolchainVersion="3.6">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="JUCE Network Graphics Demo"/>
+        <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
+                       targetName="JUCE Network Graphics Demo"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_osc" path="../../modules"/>
diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer
index 410de97740..2ce675102a 100644
--- a/examples/OSCReceiver/OSCReceiver.jucer
+++ b/examples/OSCReceiver/OSCReceiver.jucer
@@ -83,15 +83,15 @@
       </MODULEPATHS>
     </XCODE_IPHONE>
     <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
-                   androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
-                   targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified"
+                   androidInternetNeeded="1" androidBluetoothNeeded="0" androidCpp11="1"
+                   targetFolder="Builds/Android" androidScreenOrientation="unspecified"
                    gradleToolchain="clang" gradleToolchainVersion="3.6" androidSDKPath=""
                    androidNDKPath="">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="1" targetName="OSCReceiver"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="OSCReceiver"/>
+        <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
+                       targetName="OSCReceiver"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_osc" path="../../modules"/>
diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer
index 7544de5f05..9999c17864 100644
--- a/examples/OSCSender/OSCSender.jucer
+++ b/examples/OSCSender/OSCSender.jucer
@@ -75,14 +75,14 @@
       </MODULEPATHS>
     </XCODE_IPHONE>
     <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1"
-                   androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio"
+                   androidBluetoothNeeded="0" androidCpp11="1" targetFolder="Builds/Android"
                    androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified"
                    gradleToolchain="clang" gradleToolchainVersion="3.6">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="1" targetName="OSCSender"/>
-        <CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
-                       isDebug="0" optimisation="3" targetName="OSCSender"/>
+        <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
+                       targetName="OSCSender"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_osc" path="../../modules"/>
diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
index 92396e6d2f..ec1366e4cb 100644
--- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
+++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
@@ -96,10 +96,10 @@
     </LINUX_MAKE>
     <ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
                    androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
-                   androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
+                   androidScreenOrientation="unspecified" targetFolder="Builds/Android"
                    androidSDKPath="" androidNDKPath="" 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"
                    extraDefs="" extraLinkerFlags="" externalLibraries="" gradleToolchain="clang"
-                   gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
+                   gradleToolchainVersion="3.6" androidMinimumSDK="23">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" optimisation="1"
                        targetName="AudioPerformanceTest"/>