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

Side by Side Diff: runtime/tools/gyp/nss_configurations.gypi

Issue 105223002: Simplifies standalone VM Android build. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/net/zlib.gyp ('k') | runtime/tools/gyp/runtime-configurations.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 # This file is included to modify the configurations to build third-party 5 # This file is included to modify the configurations to build third-party
6 # code from Mozilla's NSS and NSPR libraries, modified by the Chromium project. 6 # code from Mozilla's NSS and NSPR libraries, modified by the Chromium project.
7 # This code is C code, not C++, and is not warning-free, so we need to remove 7 # This code is C code, not C++, and is not warning-free, so we need to remove
8 # C++-specific flags, and add flags to supress the warnings in the code. 8 # C++-specific flags, and add flags to supress the warnings in the code.
9 # This file is included from gyp files in the runtime/bin/net directory. 9 # This file is included from gyp files in the runtime/bin/net directory.
10 { 10 {
(...skipping 30 matching lines...) Expand all
41 'xcode_settings': { 41 'xcode_settings': {
42 'WARNING_CFLAGS': [ 42 'WARNING_CFLAGS': [
43 '-w', 43 '-w',
44 ], 44 ],
45 'WARNING_CFLAGS!': [ 45 'WARNING_CFLAGS!': [
46 '-Wall', 46 '-Wall',
47 '-Wextra', 47 '-Wextra',
48 ], 48 ],
49 }, 49 },
50 }, 50 },
51 # Dart_Debug and Dart_Release are merged after Dart_Base, so we can 51 # Dart_Macos_Debug and Dart_Macos_Release are merged after
52 # override the 'ansi' and '-Werror' flags set at the global level in 52 # Dart_Macos_Base, so we can override the 'ansi' and '-Werror' flags set
53 # tools/gyp/configurations_xcode.gypi. 53 # at the global level in tools/gyp/configurations_xcode.gypi.
54 'Dart_Debug': { 54 'Dart_Macos_Debug': {
55 'abstract': 1,
55 'xcode_settings': { 56 'xcode_settings': {
56 # Remove 'ansi' setting. 57 # Remove 'ansi' setting.
57 'GCC_C_LANGUAGE_STANDARD': 'c99', 58 'GCC_C_LANGUAGE_STANDARD': 'c99',
58 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off 59 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
59 }, 60 },
60 }, 61 },
61 'Dart_Release': { 62 'Dart_Macos_Release': {
63 'abstract': 1,
62 'xcode_settings': { 64 'xcode_settings': {
63 # Remove 'ansi' setting. 65 # Remove 'ansi' setting.
64 'GCC_C_LANGUAGE_STANDARD': 'c99', 66 'GCC_C_LANGUAGE_STANDARD': 'c99',
65 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off 67 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
66 }, 68 },
67 }, 69 },
70 # When being built for Android nss expects __linux__ to be defined.
71 'Dart_Android_Base': {
72 'target_conditions': [
73 ['_toolset=="host"', {
74 'defines!': [
75 'ANDROID',
76 ],
77 # Define __linux__ on Android build for NSS.
78 'defines': [
79 '__linux__',
80 ],
81 'cflags!': [
82 '-U__linux__',
83 ],
84 }],
85 ['_toolset=="target"', {
86 'defines': [
87 '__linux__',
88 'CHECK_FORK_GETPID', # Android does not provide pthread_atfork.
89 '__USE_LARGEFILE64',
90 ],
91 # Define __linux__ on Android build for NSS.
92 'cflags!': [
93 '-U__linux__',
94 ],
95 }]
96 ],
97 },
68 }, 98 },
69 }, 99 },
70 } 100 }
OLDNEW
« no previous file with comments | « runtime/bin/net/zlib.gyp ('k') | runtime/tools/gyp/runtime-configurations.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698