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

Projucer: Removed deprecated Android NDK path property

Browse source
This commit is contained in:
ed 2020-11-25 15:48:08 +00:00
parent e4c3d53c7a
commit 57f4d4a618
5 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Projucer/Source/Application/Windows/jucer_GlobalPathsWindowComponent.h
View file

@ -233,8 +233,6 @@ private:
builder.add (new FilePathPropertyComponent (androidSDKPathValue, "Android SDK", true, isThisOS),
"This path will be used when writing the local.properties file of an Android project and should point to the Android SDK folder.");
builder.add (new FilePathPropertyComponent (androidNDKPathValue, "Android NDK", true, isThisOS),
"This path will be used when writing the local.properties file of an Android project and should point to the Android NDK folder.");
if (isThisOS)
{
@ -273,7 +271,6 @@ private:
rtasPathValue = settings.getStoredPath (Ids::rtasPath, os);
aaxPathValue = settings.getStoredPath (Ids::aaxPath, os);
androidSDKPathValue = settings.getStoredPath (Ids::androidSDKPath, os);
androidNDKPathValue = settings.getStoredPath (Ids::androidNDKPath, os);
clionExePathValue = settings.getStoredPath (Ids::clionExePath, os);
androidStudioExePathValue = settings.getStoredPath (Ids::androidStudioExePath, os);
}
@ -287,7 +284,6 @@ private:
rtasPathValue .resetToDefault();
aaxPathValue .resetToDefault();
androidSDKPathValue .resetToDefault();
androidNDKPathValue .resetToDefault();
clionExePathValue .resetToDefault();
androidStudioExePathValue.resetToDefault();
@ -298,8 +294,7 @@ private:
Value selectedOSValue;
ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue,
vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, androidNDKPathValue,
clionExePathValue, androidStudioExePathValue;
vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, clionExePathValue, androidStudioExePathValue;
Viewport propertyViewport;
PropertyGroupComponent propertyGroup { "Global Paths", { getIcons().openFolder, Colours::transparentBlack } };

4
extras/Projucer/Source/Application/jucer_CommandLine.cpp
View file

@ -711,7 +711,7 @@ namespace
static bool isValidPathIdentifier (const String& id, const String& os)
{
return id == "vstLegacyPath" || (id == "aaxPath" && os != "linux") || (id == "rtasPath" && os != "linux")
|| id == "androidSDKPath" || id == "androidNDKPath" || id == "defaultJuceModulePath" || id == "defaultUserModulePath";
|| id == "androidSDKPath" || id == "defaultJuceModulePath" || id == "defaultUserModulePath";
}
static void setGlobalPath (const ArgumentList& args)
@ -872,7 +872,7 @@ namespace
<< std::endl
<< " " << appName << " --set-global-search-path os identifier_to_set new_path" << std::endl
<< " Sets the global path for a specified os and identifier. The os should be either osx, windows or linux and the identifiers can be any of the following: "
<< "defaultJuceModulePath, defaultUserModulePath, vstLegacyPath, aaxPath (not valid on linux), rtasPath (not valid on linux), androidSDKPath or androidNDKPath. " << std::endl
<< "defaultJuceModulePath, defaultUserModulePath, vstLegacyPath, aaxPath (not valid on linux), rtasPath (not valid on linux), or androidSDKPath. " << std::endl
<< std::endl
<< " " << appName << " --create-project-from-pip path/to/PIP path/to/output path/to/JUCE/modules (optional) path/to/user/modules (optional)" << std::endl
<< " Generates a folder containing a JUCE project in the specified output path using the specified PIP file. Use the optional JUCE and user module paths to override "

3
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -997,8 +997,7 @@ private:
{
String props;
props << "ndk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidNDKPath, TargetOS::getThisOS()).get().toString()) << newLine
<< "sdk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidSDKPath, TargetOS::getThisOS()).get().toString()) << newLine;
props << "sdk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidSDKPath, TargetOS::getThisOS()).get().toString()) << newLine;
return replaceLineFeeds (props, getNewLineString());
}

12
extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
View file

@ -295,14 +295,6 @@ static bool isGlobalPathValid (const File& relativeTo, const Identifier& key, co
fileToCheckFor = "platform-tools/adb";
#endif
}
else if (key == Ids::androidNDKPath)
{
#if JUCE_WINDOWS
fileToCheckFor = "ndk-depends.cmd";
#else
fileToCheckFor = "ndk-depends";
#endif
}
else if (key == Ids::defaultJuceModulePath)
{
fileToCheckFor = "juce_core";
@ -401,10 +393,6 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os)
jassertfalse;
return {};
}
else if (key == Ids::androidNDKPath)
{
return getFallbackPathForOS (Ids::androidSDKPath, os) + File::getSeparatorChar() + "ndk-bundle";
}
else if (key == Ids::clionExePath)
{
if (os == TargetOS::windows)

1
extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h
View file

@ -216,7 +216,6 @@ namespace Ids
DECLARE_ID (androidCustomApplicationClass);
DECLARE_ID (androidVersionCode);
DECLARE_ID (androidSDKPath);
DECLARE_ID (androidNDKPath);
DECLARE_ID (androidOboeRepositoryPath);
DECLARE_ID (androidInternetNeeded);
DECLARE_ID (androidArchitectures);