diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2017-07-21 10:30:41 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-21 14:38:01 -0700 |
| commit | 978b96a8b02935d40e3a2c57cd033dbedd8980e9 (patch) | |
| tree | 9ff834f9b3ecc2fb7d4a64747a37487244112a9c /android_bench_suite/apply_patches.py | |
| parent | 4af2cd8c1c4708b901c6c74c414ecba234e2b888 (diff) | |
| download | toolchain-utils-978b96a8b02935d40e3a2c57cd033dbedd8980e9.tar.gz | |
Modify the method to patch synthmark
The old way to patch synthmark kept a .mk file which will cause build
failing. Have put the .mk file patch into a diff file so that Android
building system will not see a .mk file here.
BUG=None
TEST=Checkbuild succeeded with this patched to external/toolchain-utils
on Android side.
Change-Id: I704aa02d9ca91098727786f053aeb26e989bd481
Reviewed-on: https://chromium-review.googlesource.com/581869
Commit-Ready: Zhizhou Yang <zhizhouy@chromium.org>
Tested-by: Zhizhou Yang <zhizhouy@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'android_bench_suite/apply_patches.py')
| -rwxr-xr-x | android_bench_suite/apply_patches.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/android_bench_suite/apply_patches.py b/android_bench_suite/apply_patches.py index 05849468..fbe1a8d2 100755 --- a/android_bench_suite/apply_patches.py +++ b/android_bench_suite/apply_patches.py @@ -76,15 +76,18 @@ def try_patch_synthmark(): # applied in the future. try: subprocess.check_call([ - 'bash', '-c', 'cd devrel && ' - 'repo init -u sso://devrel/manifest &&' + 'bash', '-c', 'mkdir devrel && ' + 'cd devrel && ' + 'repo init -u sso://devrel/manifest && ' 'repo sync tools/synthmark' ]) - subprocess.check_call(['cp', '-rf', synthmark_dir, config.android_home]) - subprocess.check_call([ - 'cp', 'devrel/Android.mk', - os.path.join(config.android_home, 'synthmark') - ]) + synthmark_patch = os.path.join( + os.path.dirname(os.path.realpath(__file__)), 'synthmark.diff') + subprocess.check_call(['git', '-C', synthmark_dir, + 'apply', synthmark_patch]) + + subprocess.check_call(['mv', '-f', synthmark_dir, config.android_home]) + subprocess.check_call(['rm', '-rf', 'devrel']) print('Synthmark patched successfully!') except subprocess.CalledProcessError: print('Synthmark patch not applied, error or already patched.') |