diff options
| author | thakis <thakis@chromium.org> | 2016-02-12 21:09:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-13 05:10:57 +0000 |
| commit | b78379a22336ce66dac20778db7964e40faa9180 (patch) | |
| tree | 2c6df30e220c3be4984ba2ef4abc4c0863abd01d /BUILD.gn | |
| parent | 40da0201b14884d2d1384fe4559e9032c2fef5cd (diff) | |
| download | chromium_src-b78379a22336ce66dac20778db7964e40faa9180.zip chromium_src-b78379a22336ce66dac20778db7964e40faa9180.tar.gz chromium_src-b78379a22336ce66dac20778db7964e40faa9180.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1693213002
Cr-Commit-Position: refs/heads/master@{#375349}
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -722,6 +722,9 @@ 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" ] } @@ -731,10 +734,6 @@ group("gn_only") { } } - if (enable_nacl) { - deps += [ "//native_client_sdk/src:nacl_core_sdk" ] - } - if (is_android) { deps += [ "//build/android/gyp/test:hello_world", |