diff options
| author | hidehiko <hidehiko@chromium.org> | 2014-10-23 13:00:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 20:01:01 +0000 |
| commit | 3e1fa4d680b8253deeb6c8ad21d81c4f92e80948 (patch) | |
| tree | 15cdfa1fee9a0ba3f1d788dcbe67e10ed7969d16 /base/base_nacl.gyp | |
| parent | e8d3138c104ac427f73cb9d453110135a17b6601 (diff) | |
| download | chromium_src-3e1fa4d680b8253deeb6c8ad21d81c4f92e80948.zip chromium_src-3e1fa4d680b8253deeb6c8ad21d81c4f92e80948.tar.gz chromium_src-3e1fa4d680b8253deeb6c8ad21d81c4f92e80948.tar.bz2 | |
Small refactor of base_nacl.gyp
1) Now, native_client/src/public/linux_syscalls are included
automatically during the PNaCl toolchain's build for Non-SFI.
So, it is not necessary to add it for each target.
2) <(DEPTH) is replaced by .. as relative path is preferred.
3) Sort dependencies.
4) No base_nacl_nonsfi is needed only when
"disable_nacl == 0 and disable_nacl_untrusted == 0". So we can merge
the targets.
BUG=358465
TEST=Ran trybot.
Review URL: https://codereview.chromium.org/672213002
Cr-Commit-Position: refs/heads/master@{#300933}
Diffstat (limited to 'base/base_nacl.gyp')
| -rw-r--r-- | base/base_nacl.gyp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp index 7221d2a..63e1ed4 100644 --- a/base/base_nacl.gyp +++ b/base/base_nacl.gyp @@ -36,7 +36,7 @@ ], }, 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', + '../native_client/tools.gyp:prep_toolchain', ], }, { @@ -59,22 +59,15 @@ ], }, 'dependencies': [ - '<(DEPTH)/third_party/icu/icu_nacl.gyp:icudata_nacl', - '<(DEPTH)/third_party/icu/icu_nacl.gyp:icui18n_nacl', - '<(DEPTH)/third_party/icu/icu_nacl.gyp:icuuc_nacl', - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', + '../native_client/tools.gyp:prep_toolchain', + '../third_party/icu/icu_nacl.gyp:icudata_nacl', + '../third_party/icu/icu_nacl.gyp:icui18n_nacl', + '../third_party/icu/icu_nacl.gyp:icuuc_nacl', ], }, - ], - }], - ['disable_nacl==0', { - 'targets': [ { 'target_name': 'base_nacl_nonsfi', 'type': 'none', - 'include_dirs': [ - '<(DEPTH)/native_client/src/public/linux_syscalls', - ], 'variables': { 'base_target': 1, 'nacl_untrusted_build': 1, @@ -116,8 +109,8 @@ 'rand_util_nacl.cc', ], 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', - '<(DEPTH)/third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi', + '../native_client/tools.gyp:prep_toolchain', + '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi', ], }, ], |