Browse Source

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).

tags/2021-05-28
Timur Doumler 9 years ago
parent
commit
908e1e93b9
6 changed files with 11 additions and 10 deletions
  1. +2
    -2
      examples/Demo/JuceDemo.jucer
  2. +2
    -1
      examples/MidiTest/MidiTest.jucer
  3. +2
    -2
      examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
  4. +2
    -2
      examples/OSCReceiver/OSCReceiver.jucer
  5. +1
    -1
      examples/OSCSender/OSCSender.jucer
  6. +2
    -2
      extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h

+ 2
- 2
examples/Demo/JuceDemo.jucer View File

@@ -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"/>


+ 2
- 1
examples/MidiTest/MidiTest.jucer View File

@@ -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"/>


+ 2
- 2
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer View File

@@ -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"/>


+ 2
- 2
examples/OSCReceiver/OSCReceiver.jucer View File

@@ -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"/>


+ 1
- 1
examples/OSCSender/OSCSender.jucer View File

@@ -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"/>


+ 2
- 2
extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h View File

@@ -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();


Loading…
Cancel
Save