From f29a55face97ecb7632820977ec694adb86bd6c1 Mon Sep 17 00:00:00 2001 From: Zhizhou Yang Date: Mon, 11 Sep 2017 11:00:59 -0700 Subject: Fix bugs caused by Hwui and Skia syncing After syncing aosp/internal master to up-to-date version, Hwui and Skia cannot build correctly in the suite. Did several modification to fix them: -Fixed blueprint file patch in Hwui -Fixed blueprint file patch in Skia -Removed Skia patch since its no longer needed -Fixed indentation in diff files Test: Rebuilt Skia and Hwui successfully Change-Id: I075737c038368a0a36f968e22936c53477f6b125 --- discard_patches.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'discard_patches.py') diff --git a/discard_patches.py b/discard_patches.py index a6383f6b..00c457ef 100755 --- a/discard_patches.py +++ b/discard_patches.py @@ -22,11 +22,6 @@ def discard_git(path): print('Error while removing patch in %s' % path) -def dispatch_skia(): - skia_dir = os.path.join(config.android_home, config.bench_dict['Skia']) - discard_git(skia_dir) - - def dispatch_autotest(): autotest_dir = os.path.join(config.android_home, config.autotest_dir) discard_git(autotest_dir) @@ -55,7 +50,6 @@ def dispatch_synthmark(): def main(): - dispatch_skia() dispatch_autotest() dispatch_panorama() dispatch_synthmark() -- cgit v1.2.3