p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release

This commit is contained in:
Ying Wang 2010-05-05 14:50:04 -07:00 committed by Android (Google) Code Review
parent 45470ec246 67bddace22
commit 4e601a46a6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/dexpreopt/dexpreopt.py
View File

@ -431,7 +431,12 @@ def ReadFileList(ep, dir_list, timeout=0):
if not output:
Trace('Could not ls ' + d)
return None
ret += ['%s/%s' % (d, f) for f in output.splitlines()]
# This is a work-around for the ARMv7 emulation bug.
# XXX: Switch back to the commented-out line once the bug is fixed!!
for f in output.splitlines():
if not (f == 'Maps.apk' or f == 'SholesQuickOffice.apk'):
ret += ['%s/%s' % (d, f)]
# ret += ['%s/%s' % (d, f) for f in output.splitlines()]
return ret
@ -679,7 +684,10 @@ def InstallCacheFiles(cache_system_dir, out_system_dir):
if not os.path.exists(odex_file):
if root.endswith('/system/app') or root.endswith('/system/framework'):
Trace('jar/apk %s has no .odex file %s' % (jar_file, odex_file))
return False
# This is a work-around for the ARMv7 emulation bug.
# XXX: Switch back to the commented-out line once the bug is fixed!!
continue
# return False
else:
continue