summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-08-04 09:43:27 +0800
committerBernard Xiong <[email protected]>2015-08-04 09:43:27 +0800
commit804e23a3aa801d298be3569edb15db8d6cae24ac (patch)
tree8555149b3a479c332f2572245fe914663d8b30e4 /tools
parentfd69283f3a58e0463e3909f920af6d910daef53c (diff)
[tools] fix the list in list issue when use LOCAL_* options
Diffstat (limited to 'tools')
-rw-r--r--tools/building.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/building.py b/tools/building.py
index 47ad823837..5ad6d4e9d2 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -480,6 +480,19 @@ def BuildLibInstallAction(target, source, env):
break
def DoBuilding(target, objects):
+
+ # merge all objects into one list
+ def one_list(l):
+ lst = []
+ for item in l:
+ if type(item) == type([]):
+ lst += one_list(item)
+ else:
+ lst.append(item)
+ return lst
+
+ objects = one_list(objects)
+
# remove source files with local flags setting
for group in Projects:
if group.has_key('LOCAL_CCFLAGS') or group.has_key('LOCAL_CPPPATH') or group.has_key('LOCAL_CPPDEFINES'):