godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19944 from PatrickKaster/feature/android_modules_asset_dir 

asset_dir method in Android modules' gradle config
This commit is contained in:
Rémi Verschelde 2018-07-04 23:29:38 +02:00 committed by GitHub
parent a03cf8964f 9190ae2be7
commit 4ac9932128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -81,6 +81,7 @@ env_base.android_gradle_plugins = []
env_base.android_gradle_classpath = [] env_base.android_gradle_classpath = []
env_base.android_java_dirs = [] env_base.android_java_dirs = []
env_base.android_res_dirs = [] env_base.android_res_dirs = []
env_base.android_asset_dirs = []
env_base.android_aidl_dirs = [] env_base.android_aidl_dirs = []
env_base.android_jni_dirs = [] env_base.android_jni_dirs = []
env_base.android_default_config = [] env_base.android_default_config = []
@ -106,6 +107,7 @@ env_base.__class__.android_add_flat_dir = methods.android_add_flat_dir
env_base.__class__.android_add_dependency = methods.android_add_dependency env_base.__class__.android_add_dependency = methods.android_add_dependency
env_base.__class__.android_add_java_dir = methods.android_add_java_dir env_base.__class__.android_add_java_dir = methods.android_add_java_dir
env_base.__class__.android_add_res_dir = methods.android_add_res_dir env_base.__class__.android_add_res_dir = methods.android_add_res_dir
env_base.__class__.android_add_asset_dir = methods.android_add_asset_dir
env_base.__class__.android_add_aidl_dir = methods.android_add_aidl_dir env_base.__class__.android_add_aidl_dir = methods.android_add_aidl_dir
env_base.__class__.android_add_jni_dir = methods.android_add_jni_dir env_base.__class__.android_add_jni_dir = methods.android_add_jni_dir
env_base.__class__.android_add_default_config = methods.android_add_default_config env_base.__class__.android_add_default_config = methods.android_add_default_config

5
methods.py
View File

@ -1382,6 +1382,11 @@ def android_add_res_dir(self, subpath):
if (base_path not in self.android_res_dirs): if (base_path not in self.android_res_dirs):
self.android_res_dirs.append(base_path) self.android_res_dirs.append(base_path)
def android_add_asset_dir(self, subpath):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath
if (base_path not in self.android_asset_dirs):
self.android_asset_dirs.append(base_path)
def android_add_aidl_dir(self, subpath): def android_add_aidl_dir(self, subpath):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath
if (base_path not in self.android_aidl_dirs): if (base_path not in self.android_aidl_dirs):

3
platform/android/SCsub
View File

@ -101,6 +101,9 @@ for x in env.android_jni_dirs:
gradle_asset_dirs_text = "" gradle_asset_dirs_text = ""
for x in env.android_asset_dirs:
gradle_asset_dirs_text += ",'" + x.replace("\\", "/") + "'"
gradle_default_config_text = "" gradle_default_config_text = ""
minSdk = 18 minSdk = 18