Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: runtime/tools/gyp/nss_configurations.gypi

Issue 11364150: "Reverting 14684" - Building NSS libraries. It is causing local compilation failures. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/net/zlib.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/tools/gyp/nss_configurations.gypi
diff --git a/runtime/tools/gyp/nss_configurations.gypi b/runtime/tools/gyp/nss_configurations.gypi
deleted file mode 100644
index 9487e699f12e6df4648ed08a8fed49e78e276542..0000000000000000000000000000000000000000
--- a/runtime/tools/gyp/nss_configurations.gypi
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# This file is included to modify the configurations to build third-party
-# code from Mozilla's NSS and NSPR libraries, modified by the Chromium project.
-# This code is C code, not C++, and is not warning-free, so we need to remove
-# C++-specific flags, and add flags to supress the warnings in the code.
-# This file is included from gyp files in the runtime/bin/net directory.
-{
- 'variables': {
- # Used by third_party/nss, which is from Chromium.
- 'os_posix': 1,
- 'os_bsd': 0,
- 'chromeos': 0,
- 'clang': 0,
- },
- 'target_defaults': {
- 'cflags': [
- '-Wno-unused-variable',
- '-Wno-unused-but-set-variable',
- '-Wno-missing-field-initializers',
- '-Wno-uninitialized',
- '-Wno-sign-compare',
- '-Wno-empty-body',
- '-Wno-type-limits',
- '-Wno-pointer-to-int-cast',
- '-UHAVE_CVAR_BUILT_ON_SEM',
- ],
- # Removes these flags from the list cflags.
- 'cflags!': [
- # NSS code from upstream mozilla builds with warnings,
- # so we must allow warnings without failing.
- '-Werror',
- '-Wall',
- '-ansi',
- # Not supported for C, only for C++.
- '-Wnon-virtual-dtor',
- '-Wno-conversion-null',
- '-fno-rtti',
- '-fvisibility-inlines-hidden',
- '-Woverloaded-virtual',
- ],
- 'configurations': {
- 'Dart_Base': {
- 'xcode_settings': {
- 'WARNING_CFLAGS!': [
- '-Wall',
- '-Wextra',
- ],
- },
- },
- # Dart_Debug and Dart_Release are merged after Dart_Base, so we can
- # override the 'ansi' and '-Werror' flags set at the global level in
- # tools/gyp/configurations_xcode.gypi.
- 'Dart_Debug': {
- 'xcode_settings': {
- # Remove 'ansi' setting.
- 'GCC_C_LANGUAGE_STANDARD': 'c99',
- 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
- },
- },
- 'Dart_Release': {
- 'xcode_settings': {
- # Remove 'ansi' setting.
- 'GCC_C_LANGUAGE_STANDARD': 'c99',
- 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
- },
- },
- },
- },
-}
« no previous file with comments | « runtime/bin/net/zlib.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698