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

Side by Side Diff: content/content_shell.gypi

Issue 16095003: Build fix for enable_plugins=0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | content/shell/shell_browser_main_parts.cc » ('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 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 ['use_ash==1', { 224 ['use_ash==1', {
225 'dependencies': [ 225 'dependencies': [
226 '../ash/ash.gyp:ash', 226 '../ash/ash.gyp:ash',
227 ], 227 ],
228 }], 228 }],
229 ['use_custom_freetype==1', { 229 ['use_custom_freetype==1', {
230 'dependencies': [ 230 'dependencies': [
231 '../third_party/freetype2/freetype2.gyp:freetype2', 231 '../third_party/freetype2/freetype2.gyp:freetype2',
232 ], 232 ],
233 }], 233 }],
234 ['enable_plugins==0', {
235 'sources/': [
236 ['exclude', 'shell/shell_plugin_service_filter.cc'],
237 ['exclude', 'shell/shell_plugin_service_filter.h'],
238 ],
239 }]
234 ], 240 ],
235 }, 241 },
236 { 242 {
237 'target_name': 'content_shell_resources', 243 'target_name': 'content_shell_resources',
238 'type': 'none', 244 'type': 'none',
239 'dependencies': [ 245 'dependencies': [
240 'generate_content_shell_resources', 246 'generate_content_shell_resources',
241 ], 247 ],
242 'variables': { 248 'variables': {
243 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', 249 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 'native_lib_target': 'libcontent_shell_content_view', 695 'native_lib_target': 'libcontent_shell_content_view',
690 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 696 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
691 'asset_location': '<(ant_build_out)/content_shell/assets', 697 'asset_location': '<(ant_build_out)/content_shell/assets',
692 }, 698 },
693 'includes': [ '../build/java_apk.gypi' ], 699 'includes': [ '../build/java_apk.gypi' ],
694 }, 700 },
695 ], 701 ],
696 }], # OS=="android" 702 }], # OS=="android"
697 ] 703 ]
698 } 704 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698