From a3f6661f5d17083b4b75c5dd7cf417f7722ced83 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 21 Dec 2021 10:00:51 +0000 Subject: [PATCH] Projucer: Fix relative paths for Android resource files --- .../Source/ProjectSaving/jucer_ProjectExport_Android.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index 65d56b87fce0..b36320e81df3 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -244,7 +244,7 @@ class AndroidProjectExporter final : public ProjectExporter if (androidExtraAssetsFolderValue.isNotEmpty()) { - auto extraAssets = getProject().getFile().getParentDirectory().getChildFile (androidExtraAssetsFolderValue); + auto extraAssets = getProject().getFile().getSiblingFile (androidExtraAssetsFolderValue); if (extraAssets.exists() && extraAssets.isDirectory()) { @@ -1284,7 +1284,7 @@ class AndroidProjectExporter final : public ProjectExporter if (remoteNotifsConfigFilePath.isEmpty()) 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. jassert (file.existsAsFile() && file.getFileName() == "google-services.json"); @@ -1303,7 +1303,7 @@ class AndroidProjectExporter final : public ProjectExporter for (auto& path : resourcePaths) { - auto file = getProject().getFile().getChildFile (path); + auto file = getProject().getFile().getSiblingFile (path); jassert (file.exists());