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

Side by Side Diff: components/components_tests.gyp

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 | « chrome/chrome_repack_resources.gypi ('k') | content/browser/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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 ['OS == "linux"', { 1034 ['OS == "linux"', {
1035 'sources': [ 1035 'sources': [
1036 # content_extractor is a standalone content extraction tool bu ilt as 1036 # content_extractor is a standalone content extraction tool bu ilt as
1037 # a MANUAL component_browsertest. 1037 # a MANUAL component_browsertest.
1038 'dom_distiller/standalone/content_extractor.cc', 1038 'dom_distiller/standalone/content_extractor.cc',
1039 ], 1039 ],
1040 }], 1040 }],
1041 ['OS=="win"', { 1041 ['OS=="win"', {
1042 'resource_include_dirs': [ 1042 'resource_include_dirs': [
1043 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources', 1043 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources',
1044 '<(SHARED_INTERMEDIATE_DIR)/webkit',
1045 ], 1044 ],
1046 'sources': [ 1045 'sources': [
1047 '../content/shell/app/resource.h', 1046 '../content/shell/app/resource.h',
1048 '../content/shell/app/shell.rc', 1047 '../content/shell/app/shell.rc',
1049 # TODO: It would be nice to have these pulled in 1048 # TODO: It would be nice to have these pulled in
1050 # automatically from direct_dependent_settings in 1049 # automatically from direct_dependent_settings in
1051 # their various targets (net.gyp:net_resources, etc.), 1050 # their various targets (net.gyp:net_resources, etc.),
1052 # but that causes errors in other targets when 1051 # but that causes errors in other targets when
1053 # resulting .res files get referenced multiple times. 1052 # resulting .res files get referenced multiple times.
1054 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc', 1053 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
(...skipping 24 matching lines...) Expand all
1079 'dependencies': [ 1078 'dependencies': [
1080 '../base/allocator/allocator.gyp:allocator', 1079 '../base/allocator/allocator.gyp:allocator',
1081 ], 1080 ],
1082 }], 1081 }],
1083 ], 1082 ],
1084 }, 1083 },
1085 ], 1084 ],
1086 }], 1085 }],
1087 ], 1086 ],
1088 } 1087 }
OLDNEW
« no previous file with comments | « chrome/chrome_repack_resources.gypi ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698