From 95f172e3c76a31830265f90b8bd2c5df27a240a2 Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Mon, 24 Apr 2017 00:03:48 -0500
Subject: [PATCH] add a few paths even if they are not set by JNI
---
frontend/drivers/platform_linux.c | 50 +++++++++++++++++++++----------
1 file changed, 35 insertions(+), 15 deletions(-)
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index d56237f2a6..de796161ad 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1463,6 +1463,9 @@ static void frontend_linux_get_env(int *argc,
strlcpy(app_dir, argv, sizeof(app_dir));
(*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+ */
if (env && 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;
#ifdef ANDROID
- menu_entries_append_enum(list,
- app_dir,
- msg_hash_to_str(MSG_APPLICATION_DIR),
- MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
- MENU_SETTING_ACTION, 0, 0);
- menu_entries_append_enum(list,
- internal_storage_app_path,
- msg_hash_to_str(MSG_EXTERNAL_APPLICATION_DIR),
- MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
- MENU_SETTING_ACTION, 0, 0);
- 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);
+ if (!string_is_empty(app_dir))
+ {
+ menu_entries_append_enum(list,
+ app_dir,
+ msg_hash_to_str(MSG_APPLICATION_DIR),
+ MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
+ MENU_SETTING_ACTION, 0, 0);
+ }
+ if (!string_is_empty(internal_storage_app_path))
+ {
+ menu_entries_append_enum(list,
+ internal_storage_app_path,
+ msg_hash_to_str(MSG_EXTERNAL_APPLICATION_DIR),
+ MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
+ 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,
"/storage",
msg_hash_to_str(MSG_REMOVABLE_STORAGE),