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

Android: avoiding duplicates in build.gradle

This commit is contained in:
Ramesh Ravone 2017-04-10 08:34:40 +05:30
parent 1c480698ce
commit f8309f86c2
No known key found for this signature in database
GPG Key ID: 90B471D9AC10312A
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
methods.py
View File

@ -1353,66 +1353,64 @@ def win32_spawn(sh, escape, cmd, args, spawnenv):
return exit_code return exit_code
""" """
def android_add_maven_repository(self, url): def android_add_maven_repository(self, url):
self.android_maven_repos.append(url) if (url not in self.android_maven_repos):
self.android_maven_repos.append(url)
def android_add_dependency(self, depline): def android_add_dependency(self, depline):
self.android_dependencies.append(depline) if (depline not in self.android_dependencies):
self.android_dependencies.append(depline)
def android_add_java_dir(self, subpath): def android_add_java_dir(self, subpath):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath
self.android_java_dirs.append(base_path) if (base_path not in self.android_java_dirs):
self.android_java_dirs.append(base_path)
def android_add_res_dir(self, subpath): def android_add_res_dir(self, subpath):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath
self.android_res_dirs.append(base_path) if (base_path not in self.android_res_dirs):
self.android_res_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
self.android_aidl_dirs.append(base_path) if (base_path not in self.android_aidl_dirs):
self.android_aidl_dirs.append(base_path)
def android_add_jni_dir(self, subpath): def android_add_jni_dir(self, subpath):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath
self.android_jni_dirs.append(base_path) if (base_path not in self.android_jni_dirs):
self.android_jni_dirs.append(base_path)
def android_add_gradle_plugin(self, plugin): def android_add_gradle_plugin(self, plugin):
self.android_gradle_plugins.append(plugin) if (plugin not in self.android_gradle_plugins):
self.android_gradle_plugins.append(plugin)
def android_add_gradle_classpath(self, classpath): def android_add_gradle_classpath(self, classpath):
self.android_gradle_classpath.append(classpath) if (classpath not in self.android_gradle_classpath):
self.android_gradle_classpath.append(classpath)
def android_add_default_config(self, config): def android_add_default_config(self, config):
self.android_default_config.append(config) if (config not in self.android_default_config):
self.android_default_config.append(config)
def android_add_to_manifest(self, file): def android_add_to_manifest(self, file):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file
f = open(base_path, "rb") f = open(base_path, "rb")
self.android_manifest_chunk += f.read() self.android_manifest_chunk += f.read()
def android_add_to_permissions(self, file): def android_add_to_permissions(self, file):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file
f = open(base_path, "rb") f = open(base_path, "rb")
self.android_permission_chunk += f.read() self.android_permission_chunk += f.read()
def android_add_to_attributes(self, file): def android_add_to_attributes(self, file):
base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file
f = open(base_path, "rb") f = open(base_path, "rb")
self.android_appattributes_chunk += f.read() self.android_appattributes_chunk += f.read()
def disable_module(self): def disable_module(self):
self.disabled_modules.append(self.current_module) self.disabled_modules.append(self.current_module)
def use_windows_spawn_fix(self, platform=None): def use_windows_spawn_fix(self, platform=None):
if (os.name != "nt"): if (os.name != "nt"):

6
platform/android/SCsub
View File

@ -52,13 +52,13 @@ if len(env.android_maven_repos) > 0:
gradle_maven_repos_text += "" gradle_maven_repos_text += ""
for x in env.android_maven_repos: for x in env.android_maven_repos:
gradle_maven_repos_text += "\tmaven {\n" gradle_maven_repos_text += "\tmaven {\n"
gradle_maven_repos_text += "\t\t" + x + "\n" gradle_maven_repos_text += "\t" + x + "\n"
gradle_maven_repos_text += "\t}\n" gradle_maven_repos_text += "\t}\n"
gradle_maven_dependencies_text = "" gradle_maven_dependencies_text = ""
for x in env.android_dependencies: for x in env.android_dependencies:
gradle_maven_dependencies_text += x + "\n" gradle_maven_dependencies_text += x + "\n\t"
gradle_java_dirs_text = "" gradle_java_dirs_text = ""
@ -98,7 +98,7 @@ targetSdk = 23
for x in env.android_default_config: for x in env.android_default_config:
if x.startswith("minSdkVersion") and int(x.split(" ")[-1]) < minSdk: if x.startswith("minSdkVersion") and int(x.split(" ")[-1]) < minSdk:
x = "minSdkVersion " + str(minSdk) x = "minSdkVersion " + str(minSdk)
if x.startswith("targetSdkVersion") and int(x.split()[-1]) > targetSdk: if x.startswith("targetSdkVersion") and int(x.split(" ")[-1]) > targetSdk:
x = "targetSdkVersion " + str(targetSdk) x = "targetSdkVersion " + str(targetSdk)
gradle_default_config_text += x + "\n\t\t" gradle_default_config_text += x + "\n\t\t"