From 9190ae2be7068c8a84f60766a2f7c1da3e0bcd4b Mon Sep 17 00:00:00 2001
From: Patrick Kaster <kaster@theappguys.de>
Date: Tue, 3 Jul 2018 23:28:24 +0200
Subject: [PATCH] added 'android_add_asset_dir('...') method to Android module
 gradle build config

---
 SConstruct             | 2 ++
 methods.py             | 5 +++++
 platform/android/SCsub | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index c571ef477c..bc6d37a6f2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -81,6 +81,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 = []
@@ -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_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 da60a08227..3703336b7e 100644
--- a/methods.py
+++ b/methods.py
@@ -1382,6 +1382,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 d2285a82dd..da03054ff6 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -55,7 +55,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
 
@@ -101,6 +101,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