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

Side by Side Diff: content/content.gyp

Issue 1828733004: Load application manifests from resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/browser/mojo/mojo_shell_context.cc ('k') | content/content_browser.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 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'include_dirs': [ '<@(DEPTH)' ], 51 'include_dirs': [ '<@(DEPTH)' ],
52 'dependencies': [ 52 'dependencies': [
53 'common_features', 53 'common_features',
54 ], 54 ],
55 'sources': [ 55 'sources': [
56 'public/common/feature_h264_with_openh264_ffmpeg.cc', 56 'public/common/feature_h264_with_openh264_ffmpeg.cc',
57 'public/common/feature_h264_with_openh264_ffmpeg.h', 57 'public/common/feature_h264_with_openh264_ffmpeg.h',
58 ], 58 ],
59 }, 59 },
60 { 60 {
61 # GN version: //content/browser:chrome_manifest 61 # GN version: //content/public/app:browser_manifest
62 'target_name': 'chrome_manifest', 62 'target_name': 'content_app_browser_manifest',
63 'type': 'none', 63 'type': 'none',
64 'variables': { 64 'variables': {
65 'application_type': 'exe', 65 'application_type': 'exe',
66 'application_name': 'chrome', 66 'application_name': 'content_browser',
67 'source_manifest': '<(DEPTH)/content/browser/mojo/chrome_manifest.json', 67 'source_manifest': '<(DEPTH)/content/public/app/mojo/content_browser_man ifest.json',
68 }, 68 },
69 'includes': [ 69 'includes': [
70 '../mojo/public/mojo_application_manifest.gypi', 70 '../mojo/public/mojo_application_manifest.gypi',
71 ], 71 ],
72 'hard_dependency': 1,
72 }, 73 },
73 { 74 {
74 # GN version: //content/browser:chrome_renderer_manifest 75 # GN version: //content/public/app:renderer_manifest
75 'target_name': 'chrome_renderer_manifest', 76 'target_name': 'content_app_renderer_manifest',
76 'type': 'none', 77 'type': 'none',
77 'variables': { 78 'variables': {
78 'application_type': 'exe', 79 'application_type': 'exe',
79 'application_name': 'chrome_renderer', 80 'application_name': 'content_renderer',
80 'source_manifest': 81 'source_manifest': '<(DEPTH)/content/public/app/mojo/content_renderer_ma nifest.json',
81 '<(DEPTH)/content/browser/mojo/chrome_renderer_manifest.json',
82 }, 82 },
83 'includes': [ 83 'includes': [
84 '../mojo/public/mojo_application_manifest.gypi', 84 '../mojo/public/mojo_application_manifest.gypi',
85 ], 85 ],
86 'hard_dependency': 1,
86 }, 87 },
87 ], 88 ],
88 'includes': [ 89 'includes': [
89 '../build/win_precompile.gypi', 90 '../build/win_precompile.gypi',
90 'content_resources.gypi', 91 'content_resources.gypi',
91 ], 92 ],
92 'conditions': [ 93 'conditions': [
93 ['OS == "win"', { 94 ['OS == "win"', {
94 'targets': [ 95 'targets': [
95 { 96 {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 'target_name': 'content_browser', 202 'target_name': 'content_browser',
202 'type': 'static_library', 203 'type': 'static_library',
203 'variables': { 'enable_wexit_time_destructors': 1, }, 204 'variables': { 'enable_wexit_time_destructors': 1, },
204 'includes': [ 205 'includes': [
205 'content_browser.gypi', 206 'content_browser.gypi',
206 # Disable LTO due to ELF section name out of range 207 # Disable LTO due to ELF section name out of range
207 # crbug.com/422251 208 # crbug.com/422251
208 '../build/android/disable_gcc_lto.gypi', 209 '../build/android/disable_gcc_lto.gypi',
209 ], 210 ],
210 'dependencies': [ 211 'dependencies': [
211 'chrome_manifest',
212 'chrome_renderer_manifest',
213 'content_common', 212 'content_common',
214 'content_gpu', 213 'content_gpu',
215 'content_resources', 214 'content_resources',
216 ], 215 ],
217 'export_dependent_settings': [ 216 'export_dependent_settings': [
218 'content_common', 217 'content_common',
219 ], 218 ],
220 'conditions': [ 219 'conditions': [
221 ['java_bridge==1', { 220 ['java_bridge==1', {
222 'dependencies': [ 221 'dependencies': [
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 'target_name': 'content_browser', 387 'target_name': 'content_browser',
389 'type': 'none', 388 'type': 'none',
390 'dependencies': ['content'], 389 'dependencies': ['content'],
391 'export_dependent_settings': ['content'], 390 'export_dependent_settings': ['content'],
392 }, 391 },
393 { 392 {
394 # GN version: //content/common and //content/public/common 393 # GN version: //content/common and //content/public/common
395 'target_name': 'content_common', 394 'target_name': 'content_common',
396 'type': 'none', 395 'type': 'none',
397 'dependencies': [ 396 'dependencies': [
398 'chrome_manifest',
399 'chrome_renderer_manifest',
400 'content', 397 'content',
401 'content_resources' 398 'content_resources'
402 ], 399 ],
403 # Disable c4267 warnings until we fix size_t to int truncations. 400 # Disable c4267 warnings until we fix size_t to int truncations.
404 'msvs_disabled_warnings': [ 4267, ], 401 'msvs_disabled_warnings': [ 4267, ],
405 'export_dependent_settings': ['content'], 402 'export_dependent_settings': ['content'],
406 }, 403 },
407 { 404 {
408 # GN Version: //content/child 405 # GN Version: //content/child
409 'target_name': 'content_child', 406 'target_name': 'content_child',
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 }, 678 },
682 'includes': [ 679 'includes': [
683 '../build/android/copy_ex.gypi', 680 '../build/android/copy_ex.gypi',
684 '../build/android/v8_external_startup_data_arch_suffix.gypi', 681 '../build/android/v8_external_startup_data_arch_suffix.gypi',
685 ], 682 ],
686 }, 683 },
687 ], 684 ],
688 }], # OS == "android" 685 }], # OS == "android"
689 ], 686 ],
690 } 687 }
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_shell_context.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698