summaryrefslogtreecommitdiff
path: root/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-05-20 11:16:08 -0400
committerGitHub <noreply@github.com>2021-05-20 11:16:08 -0400
commit1d175e7e137bca2bd284c42bd4269ed1e823ef6d (patch)
tree0f6a9e491b4ccc4eb1ae445c4b345311c2f6057f /Source/Android/jni/AndroidCommon/AndroidCommon.cpp
parent9312e45cbe575e41e81f6baff1ff7053b2cccd7c (diff)
parent69626f17264dffe7ba9a78c33ba8b6c2355a5840 (diff)
Merge pull request #9728 from JosJuice/android-get-shader-list
Android: Use JNI for getting post-processsing shaders
Diffstat (limited to 'Source/Android/jni/AndroidCommon/AndroidCommon.cpp')
-rw-r--r--Source/Android/jni/AndroidCommon/AndroidCommon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
index b5a5a7faaa..06da3774c2 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
@@ -44,7 +44,7 @@ std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)
return result;
}
-jobjectArray JStringArrayFromVector(JNIEnv* env, std::vector<std::string> vector)
+jobjectArray VectorToJStringArray(JNIEnv* env, std::vector<std::string> vector)
{
jobjectArray result = env->NewObjectArray(vector.size(), IDCache::GetStringClass(), nullptr);
for (jsize i = 0; i < vector.size(); ++i)
@@ -145,7 +145,7 @@ std::vector<std::string> DoFileSearchAndroidContent(const std::string& directory
JNIEnv* env = IDCache::GetEnvForThread();
jobject result = env->CallStaticObjectMethod(
IDCache::GetContentHandlerClass(), IDCache::GetContentHandlerDoFileSearch(),
- ToJString(env, directory), JStringArrayFromVector(env, extensions), recursive);
+ ToJString(env, directory), VectorToJStringArray(env, extensions), recursive);
return JStringArrayToVector(env, reinterpret_cast<jobjectArray>(result));
}