From 9b2b64c0ef37f08f0005b6158a194f91374159f0 Mon Sep 17 00:00:00 2001
From: hogliux <fabian.renn@gmail.com>
Date: Mon, 11 Jun 2018 12:40:37 +0100
Subject: [PATCH] Android:  AS no longer supports armeabi. Ensure that demo
 projects do not use it anymore

---
 examples/DemoRunner/DemoRunner.jucer                 | 2 +-
 extras/AudioPluginHost/AudioPluginHost.jucer         | 2 +-
 extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/DemoRunner/DemoRunner.jucer b/examples/DemoRunner/DemoRunner.jucer
index 32cb9a43b0..0b9b47eb54 100644
--- a/examples/DemoRunner/DemoRunner.jucer
+++ b/examples/DemoRunner/DemoRunner.jucer
@@ -93,7 +93,7 @@
                    androidEnableContentSharing="1" androidExtraAssetsFolder="../Assets"
                    smallIcon="YyqWd2" bigIcon="YyqWd2" cameraPermissionNeeded="1">
       <CONFIGURATIONS>
-        <CONFIGURATION isDebug="1" name="Debug" androidArchitectures="armeabi x86"/>
+        <CONFIGURATION isDebug="1" name="Debug" androidArchitectures="armeabi-v7a x86"/>
         <CONFIGURATION isDebug="0" name="Release"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
diff --git a/extras/AudioPluginHost/AudioPluginHost.jucer b/extras/AudioPluginHost/AudioPluginHost.jucer
index f33e3cd276..2381159c3f 100644
--- a/extras/AudioPluginHost/AudioPluginHost.jucer
+++ b/extras/AudioPluginHost/AudioPluginHost.jucer
@@ -156,7 +156,7 @@
                    androidMinimumSDK="23" androidInternetNeeded="1" microphonePermissionNeeded="1"
                    androidBluetoothNeeded="1" smallIcon="c97aUr" bigIcon="c97aUr">
       <CONFIGURATIONS>
-        <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
+        <CONFIGURATION name="Debug" androidArchitectures="armeabi-v7a x86" isDebug="1" optimisation="1"
                        linkTimeOptimisation="0" targetName="Plugin Host"/>
         <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
                        linkTimeOptimisation="1" targetName="Plugin Host"/>
diff --git a/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
index 44a46a9d50..ca4ce69f0a 100644
--- a/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
+++ b/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
@@ -130,7 +130,7 @@
                    androidCpp11="1" targetFolder="Builds/Android" androidSDKPath=""
                    androidNDKPath="" bigIcon="Ww6bQw" gradleToolchainVersion="3.6">
       <CONFIGURATIONS>
-        <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
+        <CONFIGURATION name="Debug" androidArchitectures="armeabi-v7a x86" isDebug="1"
                        optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>
         <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" targetName="JUCE Network Graphics Demo"/>
       </CONFIGURATIONS>