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

Side by Side Diff: content/content_tests.gypi

Issue 21952005: Reland: Remove webkit_chromium_resources.pak entries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 'sources': [ 887 'sources': [
888 'shell/app/resource.h', 888 'shell/app/resource.h',
889 'shell/app/shell.rc', 889 'shell/app/shell.rc',
890 # TODO: It would be nice to have these pulled in 890 # TODO: It would be nice to have these pulled in
891 # automatically from direct_dependent_settings in 891 # automatically from direct_dependent_settings in
892 # their various targets (net.gyp:net_resources, etc.), 892 # their various targets (net.gyp:net_resources, etc.),
893 # but that causes errors in other targets when 893 # but that causes errors in other targets when
894 # resulting .res files get referenced multiple times. 894 # resulting .res files get referenced multiple times.
895 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 895 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
896 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 896 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
897 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
898 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 897 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
899 ], 898 ],
900 'dependencies': [ 899 'dependencies': [
901 '<(DEPTH)/net/net.gyp:net_resources', 900 '<(DEPTH)/net/net.gyp:net_resources',
902 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 901 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
903 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 902 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
904 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 903 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
905 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 904 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
906 ], 905 ],
907 'configurations': { 906 'configurations': {
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1399 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1398 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1400 }, 1399 },
1401 ], 1400 ],
1402 }], 1401 }],
1403 ], 1402 ],
1404 }, 1403 },
1405 ], 1404 ],
1406 }], 1405 }],
1407 ], 1406 ],
1408 } 1407 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698