Commit f6f815e3 by sikang

update

parent 2853f87b
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
"//root":"project根目录, 运行目录下的相对路径 或 绝对路径", "//root":"project根目录, 运行目录下的相对路径 或 绝对路径",
"root" : "../..", "root" : "../..",
"//properties" : "gradle.properties路径",
"properties" : "../../gradle.properties",
"//lib_main":"所有加入混淆的library main目录. 'root' 下的相对路径", "//lib_main":"所有加入混淆的library main目录. 'root' 下的相对路径",
"lib_main":[ "lib_main":[
"app/src/main", "app/src/main",
......
...@@ -14,7 +14,7 @@ with open("config.json", "r", encoding="utf-8") as fin: ...@@ -14,7 +14,7 @@ with open("config.json", "r", encoding="utf-8") as fin:
config_json = json.loads(fin.read()) config_json = json.loads(fin.read())
#加入properties配置 #加入properties配置
properties = Function().load_properties(config_json['properties']) properties = Function().load_properties("%s/gradle.properties"%config_json['root'])
config = config_json.copy() config = config_json.copy()
config.update(properties) config.update(properties)
......
...@@ -16,7 +16,7 @@ config_json = {} ...@@ -16,7 +16,7 @@ config_json = {}
with open("config.json", "r", encoding="utf-8") as fin: with open("config.json", "r", encoding="utf-8") as fin:
config_json = json.loads(fin.read()) config_json = json.loads(fin.read())
properties = Function().load_properties(config_json['properties']) properties = Function().load_properties("%s/gradle.properties"%config_json['root'])
config = config_json.copy() config = config_json.copy()
config.update(properties) config.update(properties)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment