diff options
| author | teravest <teravest@chromium.org> | 2014-12-30 14:19:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-30 22:20:28 +0000 |
| commit | 39a76697e0fe1769e2ebbcf2c302b02aeedd5ed5 (patch) | |
| tree | 7ae72dfc09b521dbbfcee9a4a52b75302558ee7d /build | |
| parent | 6f25e7abcbb96a0c5eefae918f0302f7d89e21b0 (diff) | |
| download | chromium_src-39a76697e0fe1769e2ebbcf2c302b02aeedd5ed5.zip chromium_src-39a76697e0fe1769e2ebbcf2c302b02aeedd5ed5.tar.gz chromium_src-39a76697e0fe1769e2ebbcf2c302b02aeedd5ed5.tar.bz2 | |
Split mojo_nacl.gyp to fix ARM builds.
mojo_nacl.gyp has to be split into two gyp files:
* One that provides "normal" targets, and
* one that provides "untrusted" targets.
This is because build/common_untrusted.gypi sets clang=1 for all ARM builds.
For untrusted targets, this is reasonable, but this can break ARM builds of
chrome for normal targets (by passing clang flags to g++).
BUG=445489
Review URL: https://codereview.chromium.org/826393003
Cr-Commit-Position: refs/heads/master@{#309784}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 1b3b9a9..04e67c3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -475,7 +475,7 @@ }], ['disable_nacl==0 and disable_nacl_untrusted==0', { 'dependencies': [ - '../mojo/mojo_nacl.gyp:mojo_nacl', + '../mojo/mojo_nacl_untrusted.gyp:libmojo', '../mojo/mojo_nacl.gyp:monacl_codegen', '../mojo/mojo_nacl.gyp:monacl_sel', '../mojo/mojo_nacl.gyp:monacl_shell', |