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

Side by Side Diff: content/content_shell.gypi

Issue 808573003: Make devtools use common generated blink source directory instead of gen/webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing the landmine. Created 6 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
« no previous file with comments | « content/content_browser.gypi ('k') | content/shell/BUILD.gn » ('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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 503 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
504 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', 504 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
505 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 505 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
506 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 506 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
507 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', 507 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
508 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak', 508 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
509 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 509 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
510 ], 510 ],
511 'conditions': [ 511 'conditions': [
512 ['OS!="android"', { 512 ['OS!="android"', {
513 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resou rces.pak',], 513 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resour ces.pak',],
514 'pak_output': '<(PRODUCT_DIR)/content_shell.pak', 514 'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
515 }, { 515 }, {
516 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak', 516 'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell .pak',
517 }], 517 }],
518 ], 518 ],
519 }, 519 },
520 'includes': [ '../build/repack_action.gypi' ], 520 'includes': [ '../build/repack_action.gypi' ],
521 }, 521 },
522 ], 522 ],
523 }, 523 },
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1163 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1164 '--destination_dir', '<(dest_dir)', 1164 '--destination_dir', '<(dest_dir)',
1165 ], 1165 ],
1166 }, 1166 },
1167 ], 1167 ],
1168 }, 1168 },
1169 ], 1169 ],
1170 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1170 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1171 ] 1171 ]
1172 } 1172 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698