mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Projucer: Fix relative paths for Android resource files

Browse source
This commit is contained in:
ed 2021-12-21 10:00:51 +00:00 • committed by Tom Poole
parent 51d11a2be6
commit 5d5fdaf008
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -244,7 +244,7 @@ public:
if (androidExtraAssetsFolderValue.isNotEmpty()) if (androidExtraAssetsFolderValue.isNotEmpty())
{ {
auto extraAssets = getProject().getFile().getParentDirectory().getChildFile (androidExtraAssetsFolderValue); auto extraAssets = getProject().getFile().getSiblingFile (androidExtraAssetsFolderValue);
if (extraAssets.exists() && extraAssets.isDirectory()) if (extraAssets.exists() && extraAssets.isDirectory())
{ {
@ -1284,7 +1284,7 @@ private:
if (remoteNotifsConfigFilePath.isEmpty()) if (remoteNotifsConfigFilePath.isEmpty())
remoteNotifsConfigFilePath = androidRemoteNotificationsConfigFile.get().toString(); remoteNotifsConfigFilePath = androidRemoteNotificationsConfigFile.get().toString();
File file (getProject().getFile().getChildFile (remoteNotifsConfigFilePath)); File file (getProject().getFile().getSiblingFile (remoteNotifsConfigFilePath));
// Settings file must be present for remote notifications to work and it must be called google-services.json. // Settings file must be present for remote notifications to work and it must be called google-services.json.
jassert (file.existsAsFile() && file.getFileName() == "google-services.json"); jassert (file.existsAsFile() && file.getFileName() == "google-services.json");
@ -1303,7 +1303,7 @@ private:
for (auto& path : resourcePaths) for (auto& path : resourcePaths)
{ {
auto file = getProject().getFile().getChildFile (path); auto file = getProject().getFile().getSiblingFile (path);
jassert (file.exists()); jassert (file.exists());