summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-09-09 11:27:24 +0200
committerJosJuice <josjuice@gmail.com>2017-12-26 09:53:32 +0100
commitb3b7aef09a99eb10ce73a9a625654c69c74cf7bc (patch)
tree2d21d85a99e205872e62fbfe146110d027506c02 /Source/Android/jni/MainAndroid.cpp
parentd1c1793a342c61c2e04ca19136fa2ecf50d34898 (diff)
Android: Extract Sys to a different folder than the User folder
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp40
1 files changed, 16 insertions, 24 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 3e128997b4..67fb1a7957 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -450,8 +450,9 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JN
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv* env,
jobject obj,
jint slot);
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv* env,
- jobject obj);
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_CreateUserDirectories(
+ JNIEnv* env, jobject obj);
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(
JNIEnv* env, jobject obj, jstring jDirectory);
JNIEXPORT jstring JNICALL
@@ -649,28 +650,19 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JN
State::Load(slot);
}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv* env,
- jobject obj)
-{
- File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
- File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
- File::CreateFullPath(File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP WII_WC24CONF_DIR DIR_SEP
- "mbox" DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP "shared2" DIR_SEP
- "succession" DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP "shared2" DIR_SEP "ec" DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_WIIROOT_IDX) + DIR_SEP WII_SYSCONF_DIR DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
- File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
- File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
- File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
- File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
- File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
- File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
- File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX) + "Anaglyph" DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
- File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_SetSysDirectory(
+ JNIEnv* env, jobject obj, jstring jPath)
+{
+ const std::string path = GetJString(env, jPath);
+ File::SetSysDirectory(path);
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_services_DirectoryInitializationService_CreateUserDirectories(
+ JNIEnv* env, jobject obj)
+{
+ UICommon::CreateDirectories();
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(