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

Unified Diff: third_party/boringssl/boringssl_configurations.gypi

Issue 1319703002: Breaking Change: merge BoringSSL branch into master (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 months 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 | « third_party/boringssl/boringssl.gypi ('k') | third_party/boringssl/boringssl_dart.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boringssl/boringssl_configurations.gypi
diff --git a/runtime/tools/gyp/nss_configurations.gypi b/third_party/boringssl/boringssl_configurations.gypi
similarity index 92%
copy from runtime/tools/gyp/nss_configurations.gypi
copy to third_party/boringssl/boringssl_configurations.gypi
index 7f24ef4bbd6df9761a79d7ac5e5a45417ecebaa3..91c76c16b268d29284344242787f8165b78b5862 100644
--- a/runtime/tools/gyp/nss_configurations.gypi
+++ b/third_party/boringssl/boringssl_configurations.gypi
@@ -1,12 +1,11 @@
-# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+# Copyright (c) 2015, 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.
+# code from BoringSSL.
# 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.
@@ -97,4 +96,4 @@
},
},
},
-}
+}
« no previous file with comments | « third_party/boringssl/boringssl.gypi ('k') | third_party/boringssl/boringssl_dart.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698