diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-02-26 11:41:41 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-02-26 12:22:04 +0000 |
| commit | b455389686a6d4225f9270c4a2f63e03a8c0f6cd (patch) | |
| tree | 7f71ef1dadc9c75707ebe7b815739d759f74f668 /chromium/tools | |
| parent | 6f0462d7f9823471f64087345b22f5a6e1c9cef7 (diff) | |
| download | android_frameworks_webview-b455389686a6d4225f9270c4a2f63e03a8c0f6cd.tar.gz android_frameworks_webview-b455389686a6d4225f9270c4a2f63e03a8c0f6cd.tar.bz2 android_frameworks_webview-b455389686a6d4225f9270c4a2f63e03a8c0f6cd.zip | |
Add yasm to the projects to merge.
We need to merge third_party/yasm to be able to build media on x86.
Bug: 7556801
Change-Id: I0186b62ebb64836c3b9c633180343541f9f96585
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index e874008..f11ed62 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -53,6 +53,7 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'third_party/skia/src', 'third_party/smhasher/src', 'third_party/v8-i18n', + 'third_party/yasm/source/patched-yasm', 'tools/grit', 'tools/gyp', 'v8', |