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

Side by Side Diff: content/content_tests.gypi

Issue 11418003: Remove rc file for scaled resource pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep webkit_resources for DumpRenderTree Created 8 years, 1 month 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 | « content/browser/gpu/test_support_gpu.gypi ('k') | webkit/glue/resources/webkit_resources.grd » ('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': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 'sources': [ 726 'sources': [
727 'shell/resource.h', 727 'shell/resource.h',
728 'shell/shell.rc', 728 'shell/shell.rc',
729 # TODO: It would be nice to have these pulled in 729 # TODO: It would be nice to have these pulled in
730 # automatically from direct_dependent_settings in 730 # automatically from direct_dependent_settings in
731 # their various targets (net.gyp:net_resources, etc.), 731 # their various targets (net.gyp:net_resources, etc.),
732 # but that causes errors in other targets when 732 # but that causes errors in other targets when
733 # resulting .res files get referenced multiple times. 733 # resulting .res files get referenced multiple times.
734 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 734 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
735 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 735 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
736 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
737 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 736 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
738 ], 737 ],
739 'dependencies': [ 738 'dependencies': [
740 '<(DEPTH)/net/net.gyp:net_resources', 739 '<(DEPTH)/net/net.gyp:net_resources',
741 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 740 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
742 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 741 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
743 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 742 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
744 ], 743 ],
745 'configurations': { 744 'configurations': {
746 'Debug_Base': { 745 'Debug_Base': {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 'java_in_dir': '../content/shell/android/javatests', 927 'java_in_dir': '../content/shell/android/javatests',
929 'resource_dir': '../res', 928 'resource_dir': '../res',
930 'additional_src_dirs': ['../content/public/android/javatests/'], 929 'additional_src_dirs': ['../content/public/android/javatests/'],
931 }, 930 },
932 'includes': [ '../build/java_apk.gypi' ], 931 'includes': [ '../build/java_apk.gypi' ],
933 }, 932 },
934 ], 933 ],
935 }], 934 }],
936 ], 935 ],
937 } 936 }
OLDNEW
« no previous file with comments | « content/browser/gpu/test_support_gpu.gypi ('k') | webkit/glue/resources/webkit_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698