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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/plugin.gypi

Issue 9355030: Build nacl plugin with normal chromium warning levels (higher levels), (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: var setting should have been outside of target_defaults. Created 8 years, 9 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 | « ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp ('k') | no next file » | 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) 2011 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level.
7 'common_sources': [ 8 'common_sources': [
8 'file_downloader.cc', 9 'file_downloader.cc',
9 'json_manifest.cc', 10 'json_manifest.cc',
10 'module_ppapi.cc', 11 'module_ppapi.cc',
11 'nacl_subprocess.cc', 12 'nacl_subprocess.cc',
12 'nexe_arch.cc', 13 'nexe_arch.cc',
13 'plugin.cc', 14 'plugin.cc',
14 'pnacl_coordinator.cc', 15 'pnacl_coordinator.cc',
15 'pnacl_resources.cc', 16 'pnacl_resources.cc',
16 'scriptable_plugin.cc', 17 'scriptable_plugin.cc',
(...skipping 28 matching lines...) Expand all
45 }, 46 },
46 'conditions': [ 47 'conditions': [
47 ['OS=="linux"', { 48 ['OS=="linux"', {
48 'defines': [ 49 'defines': [
49 'XP_UNIX', 50 'XP_UNIX',
50 'MOZ_X11', 51 'MOZ_X11',
51 ], 52 ],
52 'cflags': [ 53 'cflags': [
53 '-Wno-long-long', 54 '-Wno-long-long',
54 ], 55 ],
56 'cflags!': [
57 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
58 ],
55 'conditions': [ 59 'conditions': [
56 ['asan!=1', { 60 ['asan!=1', {
57 'ldflags': [ 61 'ldflags': [
58 # Catch unresolved symbols. 62 # Catch unresolved symbols.
59 '-Wl,-z,defs', 63 '-Wl,-z,defs',
60 ], 64 ],
61 }], 65 }],
62 ], 66 ],
63 'libraries': [ 67 'libraries': [
64 '-ldl', 68 '-ldl',
65 '-lX11', 69 '-lX11',
66 '-lXt', 70 '-lXt',
67 ], 71 ],
68 }], 72 }],
69 ['OS=="mac"', { 73 ['OS=="mac"', {
70 'defines': [ 74 'defines': [
71 'XP_MACOSX', 75 'XP_MACOSX',
72 'XP_UNIX', 76 'XP_UNIX',
73 'TARGET_API_MAC_CARBON=1', 77 'TARGET_API_MAC_CARBON=1',
74 'NO_X11', 78 'NO_X11',
75 'USE_SYSTEM_CONSOLE', 79 'USE_SYSTEM_CONSOLE',
76 ], 80 ],
77 'cflags': [ 81 'cflags': [
78 '-Wno-long-long', 82 '-Wno-long-long',
79 ], 83 ],
84 'cflags!': [
85 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
86 ],
80 'link_settings': { 87 'link_settings': {
81 'libraries': [ 88 'libraries': [
82 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 89 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
83 ], 90 ],
84 }, 91 },
85 }], 92 }],
86 ['OS=="win"', { 93 ['OS=="win"', {
87 'defines': [ 94 'defines': [
88 'XP_WIN', 95 'XP_WIN',
89 'WIN32', 96 'WIN32',
90 '_WINDOWS' 97 '_WINDOWS'
91 ], 98 ],
92 'flags': [ 99 'flags': [
93 '-fPIC', 100 '-fPIC',
94 '-Wno-long-long', 101 '-Wno-long-long',
95 ], 102 ],
96 'link_settings': { 103 'link_settings': {
97 'libraries': [ 104 'libraries': [
98 '-lgdi32.lib', 105 '-lgdi32.lib',
99 '-luser32.lib', 106 '-luser32.lib',
100 ], 107 ],
101 }, 108 },
102 }], 109 }],
103 ], 110 ],
104 }, 111 },
105 } 112 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698