diff options
| author | pgal.u-szeged <pgal.u-szeged@partner.samsung.com> | 2014-10-31 06:53:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-31 13:53:53 +0000 |
| commit | 4b8c1e64ccae3a73fbf454ac33cd0879bbbdfa01 (patch) | |
| tree | ef25767c10765f71541e6b251a4fdc3ceb65cecd /build/isolate.gypi | |
| parent | 9cf2803cdd2ae9bb74a2e42231d9bcb1f8b8e4f5 (diff) | |
| download | chromium_src-4b8c1e64ccae3a73fbf454ac33cd0879bbbdfa01.zip chromium_src-4b8c1e64ccae3a73fbf454ac33cd0879bbbdfa01.tar.gz chromium_src-4b8c1e64ccae3a73fbf454ac33cd0879bbbdfa01.tar.bz2 | |
Fix build with disable_nacl=1
Make the isolate generation aware that the NaCl
can be disabled and don't try to use those files
if it is disabled.
BUG=428264
R=maruel@chromium.org
TEST=./build/gyp_chromium -Ddisable_nacl=1 && ninja -C out/Release
Review URL: https://codereview.chromium.org/687173002
Cr-Commit-Position: refs/heads/master@{#302257}
Diffstat (limited to 'build/isolate.gypi')
| -rw-r--r-- | build/isolate.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index 467bdaa..e6d2f98 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -91,6 +91,7 @@ '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'target_arch=<(target_arch)', '--config-variable', 'use_ozone=<(use_ozone)', + '--config-variable', 'disable_nacl=<(disable_nacl)', ], 'conditions': [ # Note: When gyp merges lists, it appends them to the old value. |