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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 10123016: Use bundled Pepper Flash on Windows (Canary, still on a field trial). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged ToT Created 8 years, 8 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 | « chrome/browser/component_updater/pepper_flash_field_trial.cc ('k') | chrome/chrome_common.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 Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 21 matching lines...) Expand all
32 'gdata_proto', 32 'gdata_proto',
33 '../build/temp_gyp/googleurl.gyp:googleurl', 33 '../build/temp_gyp/googleurl.gyp:googleurl',
34 '../content/content.gyp:content_browser', 34 '../content/content.gyp:content_browser',
35 '../crypto/crypto.gyp:crypto', 35 '../crypto/crypto.gyp:crypto',
36 '../media/media.gyp:media', 36 '../media/media.gyp:media',
37 '../net/net.gyp:net', 37 '../net/net.gyp:net',
38 '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin 38 '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin
39 '../printing/printing.gyp:printing', 39 '../printing/printing.gyp:printing',
40 '../skia/skia.gyp:skia', 40 '../skia/skia.gyp:skia',
41 '../sync/sync.gyp:syncapi_core', 41 '../sync/sync.gyp:syncapi_core',
42 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
42 '../third_party/bzip2/bzip2.gyp:bzip2', 43 '../third_party/bzip2/bzip2.gyp:bzip2',
43 '../third_party/cld/cld.gyp:cld', 44 '../third_party/cld/cld.gyp:cld',
44 '../third_party/expat/expat.gyp:expat', 45 '../third_party/expat/expat.gyp:expat',
45 '../third_party/hunspell/hunspell.gyp:hunspell', 46 '../third_party/hunspell/hunspell.gyp:hunspell',
46 '../third_party/icu/icu.gyp:icui18n', 47 '../third_party/icu/icu.gyp:icui18n',
47 '../third_party/icu/icu.gyp:icuuc', 48 '../third_party/icu/icu.gyp:icuuc',
48 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 49 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
49 '../third_party/libjingle/libjingle.gyp:libjingle', 50 '../third_party/libjingle/libjingle.gyp:libjingle',
50 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 51 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
51 '../third_party/libxml/libxml.gyp:libxml', 52 '../third_party/libxml/libxml.gyp:libxml',
(...skipping 10 matching lines...) Expand all
62 '../webkit/support/webkit_support.gyp:database', 63 '../webkit/support/webkit_support.gyp:database',
63 '../webkit/support/webkit_support.gyp:fileapi', 64 '../webkit/support/webkit_support.gyp:fileapi',
64 '../webkit/support/webkit_support.gyp:glue', 65 '../webkit/support/webkit_support.gyp:glue',
65 '../webkit/support/webkit_support.gyp:quota', 66 '../webkit/support/webkit_support.gyp:quota',
66 '../webkit/support/webkit_support.gyp:webkit_resources', 67 '../webkit/support/webkit_support.gyp:webkit_resources',
67 '../webkit/support/webkit_support.gyp:webkit_user_agent', 68 '../webkit/support/webkit_support.gyp:webkit_user_agent',
68 ], 69 ],
69 'include_dirs': [ 70 'include_dirs': [
70 '..', 71 '..',
71 '<(INTERMEDIATE_DIR)', 72 '<(INTERMEDIATE_DIR)',
73 # Needed by pepper_flash_component_installer.cc.
74 '<(SHARED_INTERMEDIATE_DIR)',
72 ], 75 ],
73 'defines': [ 76 'defines': [
74 '<@(nacl_defines)', 77 '<@(nacl_defines)',
75 ], 78 ],
76 'direct_dependent_settings': { 79 'direct_dependent_settings': {
77 'defines': [ 80 'defines': [
78 '<@(nacl_defines)', 81 '<@(nacl_defines)',
79 ], 82 ],
80 }, 83 },
81 'sources': [ 84 'sources': [
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 'browser/command_updater.h', 865 'browser/command_updater.h',
863 'browser/component_updater/component_updater_configurator.cc', 866 'browser/component_updater/component_updater_configurator.cc',
864 'browser/component_updater/component_updater_configurator.h', 867 'browser/component_updater/component_updater_configurator.h',
865 'browser/component_updater/component_unpacker.cc', 868 'browser/component_updater/component_unpacker.cc',
866 'browser/component_updater/component_unpacker.h', 869 'browser/component_updater/component_unpacker.h',
867 'browser/component_updater/component_updater_service.cc', 870 'browser/component_updater/component_updater_service.cc',
868 'browser/component_updater/component_updater_service.h', 871 'browser/component_updater/component_updater_service.h',
869 'browser/component_updater/flash_component_installer.h', 872 'browser/component_updater/flash_component_installer.h',
870 'browser/component_updater/npapi_flash_component_installer.cc', 873 'browser/component_updater/npapi_flash_component_installer.cc',
871 'browser/component_updater/pepper_flash_component_installer.cc', 874 'browser/component_updater/pepper_flash_component_installer.cc',
872 'browser/component_updater/pepper_flash_field_trial.cc',
873 'browser/component_updater/pepper_flash_field_trial.h',
874 'browser/component_updater/pnacl/pnacl_component_installer.cc', 875 'browser/component_updater/pnacl/pnacl_component_installer.cc',
875 'browser/component_updater/pnacl/pnacl_component_installer.h', 876 'browser/component_updater/pnacl/pnacl_component_installer.h',
876 'browser/component_updater/recovery_component_installer.cc', 877 'browser/component_updater/recovery_component_installer.cc',
877 'browser/component_updater/recovery_component_installer.h', 878 'browser/component_updater/recovery_component_installer.h',
878 'browser/component_updater/swiftshader_component_installer.cc', 879 'browser/component_updater/swiftshader_component_installer.cc',
879 'browser/component_updater/swiftshader_component_installer.h', 880 'browser/component_updater/swiftshader_component_installer.h',
880 'browser/content_settings/content_settings_default_provider.cc', 881 'browser/content_settings/content_settings_default_provider.cc',
881 'browser/content_settings/content_settings_default_provider.h', 882 'browser/content_settings/content_settings_default_provider.h',
882 'browser/content_settings/content_settings_details.cc', 883 'browser/content_settings/content_settings_details.cc',
883 'browser/content_settings/content_settings_details.h', 884 'browser/content_settings/content_settings_details.h',
(...skipping 4325 matching lines...) Expand 10 before | Expand all | Expand 10 after
5209 'type': 'static_library', 5210 'type': 'static_library',
5210 'sources': [ 'browser/chromeos/gdata/gdata.proto' ], 5211 'sources': [ 'browser/chromeos/gdata/gdata.proto' ],
5211 'variables': { 5212 'variables': {
5212 'proto_in_dir': 'browser/chromeos/gdata', 5213 'proto_in_dir': 'browser/chromeos/gdata',
5213 'proto_out_dir': 'chrome/browser/chromeos/gdata', 5214 'proto_out_dir': 'chrome/browser/chromeos/gdata',
5214 }, 5215 },
5215 'includes': [ '../build/protoc.gypi' ] 5216 'includes': [ '../build/protoc.gypi' ]
5216 }, 5217 },
5217 ], 5218 ],
5218 } 5219 }
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/pepper_flash_field_trial.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698