From 67bddace2239674e76f3d58f92d349eaaa4f7c7c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 4 May 2010 16:37:33 -0700 Subject: [PATCH] Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd http://b/issue?id=2650711 --- tools/dexpreopt/dexpreopt.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py index 376f1359d..b5c9ce194 100755 --- a/tools/dexpreopt/dexpreopt.py +++ b/tools/dexpreopt/dexpreopt.py @@ -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