ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add a few paths even if they are not set by JNI

This commit is contained in:
radius 2017-04-24 00:03:48 -05:00
parent 34852e159a
commit 95f172e3c7
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/drivers/platform_linux.c
View File

@ -1463,6 +1463,9 @@ static void frontend_linux_get_env(int *argc,
strlcpy(app_dir, argv, sizeof(app_dir)); strlcpy(app_dir, argv, sizeof(app_dir));
(*env)->ReleaseStringUTFChars(env, jstr, argv); (*env)->ReleaseStringUTFChars(env, jstr, argv);
__android_log_print(ANDROID_LOG_INFO,
"RetroArch", "[ENV]: app dir: [%s]\n", app_dir);
/* Check for runtime permissions on Android 6.0+ */ /* Check for runtime permissions on Android 6.0+ */
if (env && android_app->checkRuntimePermissions) if (env && android_app->checkRuntimePermissions)
CALL_VOID_METHOD(env, android_app->activity->clazz, android_app->checkRuntimePermissions); CALL_VOID_METHOD(env, android_app->activity->clazz, android_app->checkRuntimePermissions);
@ -1889,21 +1892,38 @@ static int frontend_linux_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
#ifdef ANDROID #ifdef ANDROID
menu_entries_append_enum(list, if (!string_is_empty(app_dir))
app_dir, {
msg_hash_to_str(MSG_APPLICATION_DIR), menu_entries_append_enum(list,
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, app_dir,
MENU_SETTING_ACTION, 0, 0); msg_hash_to_str(MSG_APPLICATION_DIR),
menu_entries_append_enum(list, MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
internal_storage_app_path, MENU_SETTING_ACTION, 0, 0);
msg_hash_to_str(MSG_EXTERNAL_APPLICATION_DIR), }
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, if (!string_is_empty(internal_storage_app_path))
MENU_SETTING_ACTION, 0, 0); {
menu_entries_append_enum(list, menu_entries_append_enum(list,
internal_storage_path, internal_storage_app_path,
msg_hash_to_str(MSG_INTERNAL_STORAGE), msg_hash_to_str(MSG_EXTERNAL_APPLICATION_DIR),
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
}
if (!string_is_empty(internal_storage_path))
{
menu_entries_append_enum(list,
internal_storage_path,
msg_hash_to_str(MSG_INTERNAL_STORAGE),
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
MENU_SETTING_ACTION, 0, 0);
}
else
{
menu_entries_append_enum(list,
"/storage/emulated/0",
msg_hash_to_str(MSG_REMOVABLE_STORAGE),
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
MENU_SETTING_ACTION, 0, 0);
}
menu_entries_append_enum(list, menu_entries_append_enum(list,
"/storage", "/storage",
msg_hash_to_str(MSG_REMOVABLE_STORAGE), msg_hash_to_str(MSG_REMOVABLE_STORAGE),