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

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

Issue 391343006: Pepper: Remove some gyp defines for trusted plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | 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) 2012 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 'chromium_code': 1, # Use higher warning level.
8 'common_sources': [ 8 'common_sources': [
9 'file_downloader.cc', 9 'file_downloader.cc',
10 'module_ppapi.cc', 10 'module_ppapi.cc',
(...skipping 12 matching lines...) Expand all
23 }, 23 },
24 'includes': [ 24 'includes': [
25 '../../../../../native_client/build/common.gypi', 25 '../../../../../native_client/build/common.gypi',
26 ], 26 ],
27 'target_defaults': { 27 'target_defaults': {
28 'variables': { 28 'variables': {
29 'target_platform': 'none', 29 'target_platform': 'none',
30 }, 30 },
31 'conditions': [ 31 'conditions': [
32 ['OS=="linux"', { 32 ['OS=="linux"', {
33 'defines': [
34 'XP_UNIX',
35 'MOZ_X11',
36 ],
37 'cflags': [ 33 'cflags': [
38 '-Wno-long-long', 34 '-Wno-long-long',
39 ], 35 ],
40 'cflags!': [ 36 'cflags!': [
41 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags. 37 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
42 ], 38 ],
43 'conditions': [ 39 'conditions': [
44 ['asan!=1 and msan!=1 and ubsan_vptr!=1', { 40 ['asan!=1 and msan!=1 and ubsan_vptr!=1', {
45 'ldflags': [ 41 'ldflags': [
46 # Catch unresolved symbols. 42 # Catch unresolved symbols.
47 '-Wl,-z,defs', 43 '-Wl,-z,defs',
48 ], 44 ],
49 }], 45 }],
50 ], 46 ],
51 'libraries': [ 47 'libraries': [
52 '-ldl', 48 '-ldl',
53 ], 49 ],
54 }], 50 }],
55 ['OS=="mac"', { 51 ['OS=="mac"', {
56 'defines': [
57 'XP_MACOSX',
58 'XP_UNIX',
59 'TARGET_API_MAC_CARBON=1',
60 'NO_X11',
61 'USE_SYSTEM_CONSOLE',
62 ],
63 'cflags': [ 52 'cflags': [
64 '-Wno-long-long', 53 '-Wno-long-long',
65 ], 54 ],
66 'cflags!': [ 55 'cflags!': [
67 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags. 56 '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
68 ], 57 ],
69 'link_settings': { 58 'link_settings': {
70 'libraries': [ 59 'libraries': [
71 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 60 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
72 ], 61 ],
73 }, 62 },
74 }], 63 }],
75 ['OS=="win"', { 64 ['OS=="win"', {
76 'defines': [ 65 'defines': [
77 'XP_WIN',
78 'WIN32', 66 'WIN32',
79 '_WINDOWS' 67 '_WINDOWS'
80 ], 68 ],
81 'flags': [ 69 'flags': [
82 '-fPIC', 70 '-fPIC',
83 '-Wno-long-long', 71 '-Wno-long-long',
84 ], 72 ],
85 'link_settings': { 73 'link_settings': {
86 'libraries': [ 74 'libraries': [
87 '-lgdi32.lib', 75 '-lgdi32.lib',
88 '-luser32.lib', 76 '-luser32.lib',
89 ], 77 ],
90 }, 78 },
91 }], 79 }],
92 ], 80 ],
93 }, 81 },
94 } 82 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698