diff options
| author | Patrick Kaster <kaster@theappguys.de> | 2018-07-03 23:28:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-05 01:58:33 +0200 |
| commit | 8bb90fd5f3b9819bc3bc475e8b9f36c012d6c855 (patch) | |
| tree | fe0cce2d2352db5e6b62124774ddfb578a8a3244 | |
| parent | d4f860c768364081dff128ba5da21ec442d76e84 (diff) | |
added 'android_add_asset_dir('...') method to Android module gradle build config
(cherry picked from commit 9190ae2be7068c8a84f60766a2f7c1da3e0bcd4b)
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | methods.py | 5 | ||||
| -rw-r--r-- | platform/android/SCsub | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 7ef4d646a7..cb1e9fd567 100644 --- a/SConstruct +++ b/SConstruct @@ -74,6 +74,7 @@ env_base.android_gradle_plugins = [] env_base.android_gradle_classpath = [] env_base.android_java_dirs = [] env_base.android_res_dirs = [] +env_base.android_asset_dirs = [] env_base.android_aidl_dirs = [] env_base.android_jni_dirs = [] env_base.android_default_config = [] @@ -99,6 +100,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_java_dir = methods.android_add_java_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_jni_dir = methods.android_add_jni_dir env_base.__class__.android_add_default_config = methods.android_add_default_config diff --git a/methods.py b/methods.py index 227a17d312..33d503a41a 100644 --- a/methods.py +++ b/methods.py @@ -937,6 +937,11 @@ def android_add_res_dir(self, subpath): if (base_path not in self.android_res_dirs): 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): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath if (base_path not in self.android_aidl_dirs): diff --git a/platform/android/SCsub b/platform/android/SCsub index 8c08289932..a65dab9668 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -53,7 +53,7 @@ if len(env.android_flat_dirs) > 0: gradle_maven_flat_text = gradle_maven_flat_text[:-1] gradle_maven_flat_text += "\n\t}\n" - + gradle_maven_repos_text = "" gradle_maven_repos_text += gradle_maven_flat_text @@ -99,6 +99,9 @@ for x in env.android_jni_dirs: gradle_asset_dirs_text = "" +for x in env.android_asset_dirs: + gradle_asset_dirs_text += ",'" + x.replace("\\", "/") + "'" + gradle_default_config_text = "" minSdk = 18 |