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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Jay's comments and rebase Created 8 years 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 2193 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 'autofill_regexes', 2204 'autofill_regexes',
2205 'browser/performance_monitor/performance_monitor.gyp:performance_mon itor', 2205 'browser/performance_monitor/performance_monitor.gyp:performance_mon itor',
2206 'browser_extensions', 2206 'browser_extensions',
2207 'common/extensions/api/api.gyp:api', 2207 'common/extensions/api/api.gyp:api',
2208 'debugger', 2208 'debugger',
2209 'installer_util', 2209 'installer_util',
2210 'sync_file_system_proto', 2210 'sync_file_system_proto',
2211 '../cc/cc.gyp:cc', 2211 '../cc/cc.gyp:cc',
2212 '../content/content.gyp:navigation_interception', 2212 '../content/content.gyp:navigation_interception',
2213 '../net/net.gyp:net_with_v8', 2213 '../net/net.gyp:net_with_v8',
2214 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
2215 '../printing/printing.gyp:printing', 2214 '../printing/printing.gyp:printing',
2216 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', 2215 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
2217 '../third_party/expat/expat.gyp:expat', 2216 '../third_party/expat/expat.gyp:expat',
2218 '../third_party/hunspell/hunspell.gyp:hunspell', 2217 '../third_party/hunspell/hunspell.gyp:hunspell',
2219 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 2218 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
2220 '../third_party/libjingle/libjingle.gyp:libjingle', 2219 '../third_party/libjingle/libjingle.gyp:libjingle',
2221 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 2220 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
2222 '../third_party/npapi/npapi.gyp:npapi', 2221 '../third_party/npapi/npapi.gyp:npapi',
2223 '../third_party/re2/re2.gyp:re2', 2222 '../third_party/re2/re2.gyp:re2',
2224 '../ui/surface/surface.gyp:surface', 2223 '../ui/surface/surface.gyp:surface',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
2353 ['exclude', 'browser/value_store/policy_value_store.cc'], 2352 ['exclude', 'browser/value_store/policy_value_store.cc'],
2354 ['exclude', 'browser/value_store/policy_value_store.h'], 2353 ['exclude', 'browser/value_store/policy_value_store.h'],
2355 ['include', 'browser/policy/policy_map.cc'], 2354 ['include', 'browser/policy/policy_map.cc'],
2356 ['include', 'browser/policy/policy_map.h'], 2355 ['include', 'browser/policy/policy_map.h'],
2357 ['include', 'browser/policy/policy_service.cc'], 2356 ['include', 'browser/policy/policy_service.cc'],
2358 ['include', 'browser/policy/policy_service.h'], 2357 ['include', 'browser/policy/policy_service.h'],
2359 ['include', 'browser/policy/policy_service_stub.cc'], 2358 ['include', 'browser/policy/policy_service_stub.cc'],
2360 ['include', 'browser/policy/policy_service_stub.h'], 2359 ['include', 'browser/policy/policy_service_stub.h'],
2361 ], 2360 ],
2362 }], 2361 }],
2362 ['enable_ppapi==1', {
2363 'dependencies': [
2364 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
brettw 2012/11/30 23:18:12 Can you just delete the comment here? It's out of
nilesh 2012/12/01 00:41:35 Done.
2365 ],
2366 }, { # enable_ppapi==0
2367 'sources/': [
2368 ['exclude', '^browser/pepper_'],
2369 ['exclude', '^browser/renderer_host/pepper/'],
2370 ],
2371 }],
2363 ['safe_browsing==1', { 2372 ['safe_browsing==1', {
2364 'defines': [ 2373 'defines': [
2365 'FULL_SAFE_BROWSING', 2374 'FULL_SAFE_BROWSING',
2366 ], 2375 ],
2367 }], 2376 }],
2368 ['safe_browsing==2', { 2377 ['safe_browsing==2', {
2369 'defines': [ 2378 'defines': [
2370 'MOBILE_SAFE_BROWSING', 2379 'MOBILE_SAFE_BROWSING',
2371 ], 2380 ],
2372 'dependencies!': [ 2381 'dependencies!': [
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
3108 'proto_in_dir': '../third_party/cros_system_api/dbus', 3117 'proto_in_dir': '../third_party/cros_system_api/dbus',
3109 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 3118 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
3110 }, 3119 },
3111 'includes': ['../build/protoc.gypi'], 3120 'includes': ['../build/protoc.gypi'],
3112 }, 3121 },
3113 ], 3122 ],
3114 }, 3123 },
3115 ], 3124 ],
3116 ], 3125 ],
3117 } 3126 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698