diff options
Diffstat (limited to 'chromium/tools/merge_from_chromium.py')
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index a2cdb04..812af1b 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -21,6 +21,7 @@ import logging import optparse import os import re +import shutil import sys import urllib2 @@ -293,6 +294,13 @@ def _GenerateMakefiles(version, unattended): raise merge_common.TemporaryMergeError('Makefile generation failed: ' + str(e)) + # Copy ARM makefile to ARM64 to allow multiarch builds + for host in ['linux', 'darwin']: + shutil.copy(os.path.join(merge_common.REPOSITORY_ROOT, + 'GypAndroid.%s-arm.mk' % host), + os.path.join(merge_common.REPOSITORY_ROOT, + 'GypAndroid.%s-arm64.mk' % host)) + for path in merge_common.ALL_PROJECTS: dest_dir = os.path.join(merge_common.REPOSITORY_ROOT, path) # git add doesn't have an --ignore-unmatch so we have to do this instead: |