noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[Android] Fix the use of --main-pack

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2026-05-15 09:49:33 -07:00
parent 720caf476d
commit 948032c89c
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/io/file_access.h
+1
View File
@@ -107,6 +107,7 @@ public:
protected:
static void _bind_methods();
friend class Main;
AccessType get_access_type() const;
virtual String fix_path(const String &p_path) const;
virtual Error open_internal(const String &p_path, int p_mode_flags) = 0; ///< open a file
main/main.cpp
+24 -3
View File
@@ -575,8 +575,11 @@ void Main::print_help(const char *p_binary) {
#if defined(OVERRIDE_PATH_ENABLED)
print_help_option("--path <directory>", "Path to a project (<directory> must contain a \"project.godot\" file).\n", CLI_OPTION_AVAILABILITY_TEMPLATE_UNSAFE);
print_help_option("--scene <path>", "Path or UID of a scene in the project that should be started.\n", CLI_OPTION_AVAILABILITY_TEMPLATE_UNSAFE);
print_help_option("--main-pack <file>", "Path to a pack (.pck) file to load.\n", CLI_OPTION_AVAILABILITY_TEMPLATE_UNSAFE);
#endif // defined(OVERRIDE_PATH_ENABLED)
#if defined(OVERRIDE_PATH_ENABLED) || defined(ANDROID_ENABLED) || defined(WEB_ENABLED)
print_help_option("--main-pack <file>", "Path to a pack (.pck) file to load.\n", CLI_OPTION_AVAILABILITY_TEMPLATE_UNSAFE);
#endif // defined(OVERRIDE_PATH_ENABLED) || defined(ANDROID_ENABLED) || defined(WEB_ENABLED)
#ifdef DISABLE_DEPRECATED
print_help_option("--render-thread <mode>", "Render thread mode (\"safe\", \"separate\").\n");
#else
@@ -1854,10 +1857,28 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
goto error;
}
} else if (arg == "--main-pack") {
#if defined(OVERRIDE_PATH_ENABLED) || defined(WEB_ENABLED) // Note: main-pack is always used on web and can't be disabled.
// Note: main-pack is always used on web and can't be disabled.
// Note: main-pack can be used on Android so long as it's located within the 'assets' directory which is in the executable.
#if defined(OVERRIDE_PATH_ENABLED) || defined(WEB_ENABLED) || defined(ANDROID_ENABLED)
if (N) {
main_pack = N->get();
N = N->next();
#if defined(ANDROID_ENABLED) && !defined(OVERRIDE_PATH_ENABLED)
// Validate that `main_pack` is located within the 'assets' directory.
Ref<FileAccess> main_pack_fa = FileAccess::create_for_path(main_pack);
if (main_pack_fa.is_valid()) {
if (main_pack_fa->get_access_type() != FileAccess::ACCESS_RESOURCES) {
ERR_PRINT(
"--main-pack is attempting to load from outside of the executable, but this Godot binary was compiled without support for path overrides. Aborting.\n"
"To be able to use it, use the `disable_path_overrides=no` SCons option when compiling Godot.\n");
goto error;
}
} else {
ERR_PRINT("Invalid path to main pack file, aborting.\n");
goto error;
}
#endif // defined(ANDROID_ENABLED) && !defined(OVERRIDE_PATH_ENABLED)
} else {
OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
goto error;
@@ -1867,7 +1888,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
"`--main-pack` was specified on the command line, but this Godot binary was compiled without support for path overrides. Aborting.\n"
"To be able to use it, use the `disable_path_overrides=no` SCons option when compiling Godot.\n");
goto error;
#endif // defined(OVERRIDE_PATH_ENABLED) || defined(WEB_ENABLED)
#endif // defined(OVERRIDE_PATH_ENABLED) || defined(WEB_ENABLED) || defined(ANDROID_ENABLED)
} else if (arg == "-d" || arg == "--debug") {
debug_uri = "local://";
platform/android/os_android.cpp
+10 -8
View File
@@ -109,25 +109,27 @@ void OS_Android::initialize_core() {
#ifdef TOOLS_ENABLED
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
#else
#else // TOOLS_ENABLED
FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES);
#if defined(OVERRIDE_PATH_ENABLED)
if (use_apk_expansion) {
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
} else {
FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES);
}
#endif
#endif // defined(OVERRIDE_PATH_ENABLED)
#endif // TOOLS_ENABLED
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA);
FileAccess::make_default<FileAccessFilesystemJAndroid>(FileAccess::ACCESS_FILESYSTEM);
#ifdef TOOLS_ENABLED
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_RESOURCES);
#else
#else // TOOLS_ENABLED
DirAccess::make_default<DirAccessJAndroid>(DirAccess::ACCESS_RESOURCES);
#if defined(OVERRIDE_PATH_ENABLED)
if (use_apk_expansion) {
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_RESOURCES);
} else {
DirAccess::make_default<DirAccessJAndroid>(DirAccess::ACCESS_RESOURCES);
}
#endif
#endif // defined(OVERRIDE_PATH_ENABLED)
#endif // TOOLS_ENABLED
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_USERDATA);
DirAccess::make_default<DirAccessJAndroid>(DirAccess::ACCESS_FILESYSTEM);