asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5574 from volzhs/android-app-id

Browse source 
Add android_add_default_config for config.py
This commit is contained in:
Juan Linietsky 2016-07-10 13:03:37 -03:00 committed by GitHub
commit e74d71a5bf
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -73,6 +73,7 @@ env_base.android_java_dirs=[]
env_base.android_res_dirs=[] env_base.android_res_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_manifest_chunk="" env_base.android_manifest_chunk=""
env_base.android_permission_chunk="" env_base.android_permission_chunk=""
env_base.android_appattributes_chunk="" env_base.android_appattributes_chunk=""
@ -88,6 +89,7 @@ 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_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_to_manifest = methods.android_add_to_manifest env_base.__class__.android_add_to_manifest = methods.android_add_to_manifest
env_base.__class__.android_add_to_permissions = methods.android_add_to_permissions env_base.__class__.android_add_to_permissions = methods.android_add_to_permissions
env_base.__class__.android_add_to_attributes = methods.android_add_to_attributes env_base.__class__.android_add_to_attributes = methods.android_add_to_attributes

2
methods.py
View file

@ -1326,6 +1326,8 @@ def android_add_aidl_dir(self,subpath):
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) self.android_jni_dirs.append(base_path)
def android_add_default_config(self,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

6
platform/android/SCsub
View file

@ -79,6 +79,11 @@ for x in env.android_jni_dirs:
gradle_asset_dirs_text="" gradle_asset_dirs_text=""
gradle_default_config_text=""
for x in env.android_default_config:
gradle_default_config_text+=x+"\n\t\t"
gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text) gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text)
gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text) gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text)
gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text) gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text)
@ -86,6 +91,7 @@ gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$",gradle_res_dirs_text)
gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text) gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text)
gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text) gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text)
gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text) gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text)
gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$",gradle_default_config_text)
gradle_baseout.write( gradle_text ) gradle_baseout.write( gradle_text )

1
platform/android/build.gradle.template
View file

@ -39,6 +39,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 23 targetSdkVersion 23
$$GRADLE_DEFAULT_CONFIG$$
} }
sourceSets { sourceSets {
main { main {