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

Side by Side Diff: chrome/chrome_resources.gyp

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm the build files from webkit/glue/resources Created 6 years, 4 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
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 'variables': { 5 'variables': {
6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt',
9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js', 9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js',
10 }, 10 },
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 { 438 {
439 'includes': ['chrome_repack_chrome_100_percent.gypi'] 439 'includes': ['chrome_repack_chrome_100_percent.gypi']
440 }, 440 },
441 { 441 {
442 'includes': ['chrome_repack_chrome_200_percent.gypi'] 442 'includes': ['chrome_repack_chrome_200_percent.gypi']
443 }, 443 },
444 ], 444 ],
445 'conditions': [ 445 'conditions': [
446 ['OS != "ios"', { 446 ['OS != "ios"', {
447 'dependencies': [ 447 'dependencies': [
448 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resour ces',
448 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings', 449 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
449 '<(DEPTH)/content/content_resources.gyp:content_resources', 450 '<(DEPTH)/content/content_resources.gyp:content_resources',
450 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces', 451 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resour ces',
451 '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resource s',
452 ], 452 ],
453 }], 453 }],
454 ['use_ash==1', { 454 ['use_ash==1', {
455 'dependencies': [ 455 'dependencies': [
456 '<(DEPTH)/ash/ash_resources.gyp:ash_resources', 456 '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
457 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', 457 '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
458 ], 458 ],
459 }], 459 }],
460 ['chromeos==1', { 460 ['chromeos==1', {
461 'dependencies': [ 461 'dependencies': [
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 '<(generator_path)', 569 '<(generator_path)',
570 'credits', 570 'credits',
571 '<(about_credits_file)', 571 '<(about_credits_file)',
572 ], 572 ],
573 'message': 'Generating about:credits', 573 'message': 'Generating about:credits',
574 }, 574 },
575 ], 575 ],
576 }, 576 },
577 ], # targets 577 ], # targets
578 } 578 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698