| OLD | NEW |
| 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 'variables': { | 6 'variables': { |
| 7 'layouttest_support_content_sources': [ | 7 'layouttest_support_content_sources': [ |
| 8 'public/test/layouttest_support.h', | 8 'public/test/layouttest_support.h', |
| 9 'public/test/nested_message_pump_android.cc', | 9 'public/test/nested_message_pump_android.cc', |
| 10 'public/test/nested_message_pump_android.h', | 10 'public/test/nested_message_pump_android.h', |
| (...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1443 'HAS_OUT_OF_PROC_TEST_RUNNER', | 1443 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 1444 ], | 1444 ], |
| 1445 'sources': [ '<@(content_browsertests_sources)' ], | 1445 'sources': [ '<@(content_browsertests_sources)' ], |
| 1446 'conditions': [ | 1446 'conditions': [ |
| 1447 ['OS=="win"', { | 1447 ['OS=="win"', { |
| 1448 'resource_include_dirs': [ | 1448 'resource_include_dirs': [ |
| 1449 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 1449 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 1450 ], | 1450 ], |
| 1451 'sources': [ | 1451 'sources': [ |
| 1452 '<@(content_browsertests_win_sources)', | 1452 '<@(content_browsertests_win_sources)', |
| 1453 # TODO: It would be nice to have these pulled in | 1453 # TODO: It would be nice to have these pulled in automatically |
| 1454 # automatically from direct_dependent_settings in | 1454 # from direct_dependent_settings in their various targets but |
| 1455 # their various targets (net.gyp:net_resources, etc.), | 1455 # that causes errors in other targets when resulting .res files |
| 1456 # but that causes errors in other targets when | 1456 # get referenced multiple times. |
| 1457 # resulting .res files get referenced multiple times. | |
| 1458 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc
es.rc', | 1457 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc
es.rc', |
| 1459 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_
en-US.rc', | 1458 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_
en-US.rc', |
| 1460 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | |
| 1461 'shell/app/resource.h', | 1459 'shell/app/resource.h', |
| 1462 'shell/app/shell.rc', | 1460 'shell/app/shell.rc', |
| 1463 ], | 1461 ], |
| 1464 'dependencies': [ | 1462 'dependencies': [ |
| 1465 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string
s', | 1463 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string
s', |
| 1466 '<(DEPTH)/net/net.gyp:net_resources', | 1464 '<(DEPTH)/net/net.gyp:net_resources', |
| 1467 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re
sources', | 1465 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re
sources', |
| 1468 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2
', | 1466 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2
', |
| 1469 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', | 1467 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', |
| 1470 ], | 1468 ], |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2109 ], | 2107 ], |
| 2110 }, | 2108 }, |
| 2111 'includes': [ | 2109 'includes': [ |
| 2112 '../build/host_jar.gypi', | 2110 '../build/host_jar.gypi', |
| 2113 ], | 2111 ], |
| 2114 }, | 2112 }, |
| 2115 ], | 2113 ], |
| 2116 }], | 2114 }], |
| 2117 ], | 2115 ], |
| 2118 } | 2116 } |
| OLD | NEW |