diff options
| author | sbc <sbc@chromium.org> | 2016-02-17 19:28:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-18 03:30:01 +0000 |
| commit | 92b4d57412e176e3569734b7e33167588b6267db (patch) | |
| tree | 4d020933fd278481d46813595b7ca703b8ac8dd7 /BUILD.gn | |
| parent | 1002bde384f0a529949d2861b947110af0f91929 (diff) | |
| download | chromium_src-92b4d57412e176e3569734b7e33167588b6267db.zip chromium_src-92b4d57412e176e3569734b7e33167588b6267db.tar.gz chromium_src-92b4d57412e176e3569734b7e33167588b6267db.tar.bz2 | |
Reland of [NaCl SDK] Add initial support for building the SDK with gn (patchset #1 id:1 of https://codereview.chromium.org/1693213002/ )
Reason for revert:
clang/win compile failures was fixed:
https://codereview.chromium.org/1706613002
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_clang_x64_dbg
Original issue's description:
> Revert of [NaCl SDK] Add initial support for building the SDK with gn (patchset #6 id:100001 of https://codereview.chromium.org/1693053002/ )
>
> Reason for revert:
> Doesn't build with clang/win and looks nontrivial to fix:
>
> https://build.chromium.org/p/chromium.fyi/builders/CrWinClang64%28dbg%29/builds/3655/steps/compile/logs/stdio
>
> FAILED: ninja -t msvc -e environment.x64 -- E:\b\build\goma/gomacc.exe ../../third_party/llvm-build/Release+Asserts/bin/clang-cl.exe /nologo /showIncludes /FC @obj/native_client/src/trusted/validator/driver/ncval_new/ncval.obj.rsp /c ../../native_client/src/trusted/validator/driver/ncval.cc /Foobj/native_client/src/trusted/validator/driver/ncval_new/ncval.obj /Fdobj/native_client/src/trusted/validator/driver/ncval_new_cc.pdb
> ../../native_client/src/trusted/validator/driver/ncval.cc(359,36) : error: ISO C++11 does not allow conversion from string literal to 'char *' [-Werror,-Wwritable-strings]
> while ((opt = getopt(argc, argv, "vd")) != -1) {
> ^
>
> (and i'm guessing several more)
>
> Original issue's description:
> > [NaCl SDK] Add initial support for building the SDK with gn
> >
> > build_sdk.py still uses gyp. I have a followup CL to
> > convert that to gn.
> >
> > BUG=585999
>
> TBR=binji@chromium.org,dpranke@chromium.org,bradnelson@chromium.org,sbc@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=585999
>
> Committed: https://crrev.com/b78379a22336ce66dac20778db7964e40faa9180
> Cr-Commit-Position: refs/heads/master@{#375349}
TBR=binji@chromium.org,dpranke@chromium.org,bradnelson@chromium.org,thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=585999
Review URL: https://codereview.chromium.org/1705923002
Cr-Commit-Position: refs/heads/master@{#376080}
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -720,9 +720,6 @@ group("gn_only") { "//third_party/libjpeg_turbo:simd_asm", ] } - if (enable_nacl) { - deps += [ "//native_client/src/trusted/service_runtime:sel_ldr" ] - } if (use_ozone) { deps += [ "//ui/ozone/demo" ] } @@ -732,6 +729,10 @@ group("gn_only") { } } + if (enable_nacl) { + deps += [ "//native_client_sdk/src:nacl_core_sdk" ] + } + if (is_android) { deps += [ "//build/android/gyp/test:hello_world", |