Jelajahi Sumber

added 'android_add_asset_dir('...') method to Android module gradle build config

(cherry picked from commit 9190ae2be7068c8a84f60766a2f7c1da3e0bcd4b)
Patrick Kaster 7 tahun lalu
induk
melakukan
8bb90fd5f3
3 mengubah file dengan 11 tambahan dan 1 penghapusan
  1. 2 0
      SConstruct
  2. 5 0
      methods.py
  3. 4 1
      platform/android/SCsub

+ 2 - 0
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

+ 5 - 0
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):

+ 4 - 1
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