summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2016-02-12 21:09:56 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-13 05:10:57 +0000
commitb78379a22336ce66dac20778db7964e40faa9180 (patch)
tree2c6df30e220c3be4984ba2ef4abc4c0863abd01d /native_client_sdk
parent40da0201b14884d2d1384fe4559e9032c2fef5cd (diff)
downloadchromium_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 'native_client_sdk')
-rw-r--r--native_client_sdk/src/BUILD.gn65
1 files changed, 0 insertions, 65 deletions
diff --git a/native_client_sdk/src/BUILD.gn b/native_client_sdk/src/BUILD.gn
deleted file mode 100644
index 9b33bed..0000000
--- a/native_client_sdk/src/BUILD.gn
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/features.gni")
-
-declare_args() {
- # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)
- # binaries is supported.
- enable_cross_trusted = is_linux
-
- # Build the nacl SDK untrusted components. This is disabled by default since
- # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc)
- nacl_sdk_untrusted = false
-}
-
-if (enable_nacl) {
- group("nacl_core_sdk") {
- # Targets that get included in the NaCl SDK
- # See: native_client_sdk/src/build_tools/build_sdk.py
- deps = []
- if (enable_cross_trusted ||
- (target_cpu != "arm" && target_cpu != "mipsel")) {
- # cross compiling trusted binaries such as sel_ldr is only currently
- # supported on linux, and requires specific cross compilers to be
- # installed. It can be disabled with 'disable_cross_trusted=1'
- deps = [
- "//native_client/src/trusted/service_runtime:sel_ldr",
- "//native_client/src/trusted/validator/driver:ncval_new",
- ]
- if (is_linux) {
- deps += [ "//native_client/src/nonsfi/loader:nonsfi_loader" ]
- }
- }
- if (nacl_sdk_untrusted) {
- deps += [
- # elf_loader is only used on ARM
- "//native_client/src/untrusted/elf_loader:elf_loader(//build/toolchain/nacl:clang_newlib_arm)",
- "//native_client/src/untrusted/irt:irt_core(//build/toolchain/nacl:irt_arm)",
- "//native_client/src/untrusted/irt:irt_core(//build/toolchain/nacl:irt_x64)",
- "//native_client/src/untrusted/irt:irt_core(//build/toolchain/nacl:irt_x86)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:clang_newlib_arm)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:clang_newlib_x64)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:clang_newlib_x86)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:glibc_arm)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:glibc_x64)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:glibc_x86)",
- "//ppapi/native_client:ppapi_lib(//build/toolchain/nacl:newlib_pnacl)",
- "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:clang_newlib_arm)",
- "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:clang_newlib_x64)",
- "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:clang_newlib_x86)",
- ]
- }
-
- # TODO(binji): dump_syms doesn't currently build on Windows. See
- # http://crbug.com/245456
- if (!is_win && target_cpu == "x64") {
- deps += [
- "//breakpad:dump_syms($host_toolchain)",
- "//breakpad:minidump_dump($host_toolchain)",
- "//breakpad:minidump_stackwalk($host_toolchain)",
- ]
- }
- }
-}