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

Side by Side Diff: components/components_tests.gyp

Issue 1281483012: Remove net_resources.rc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | content/browser/gpu/test_support_gpu.gypi » ('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 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 'dom_distiller/standalone/content_extractor_browsertest.cc', 1462 'dom_distiller/standalone/content_extractor_browsertest.cc',
1463 ], 1463 ],
1464 }], 1464 }],
1465 ['OS=="win"', { 1465 ['OS=="win"', {
1466 'resource_include_dirs': [ 1466 'resource_include_dirs': [
1467 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources', 1467 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources',
1468 ], 1468 ],
1469 'sources': [ 1469 'sources': [
1470 '../content/shell/app/resource.h', 1470 '../content/shell/app/resource.h',
1471 '../content/shell/app/shell.rc', 1471 '../content/shell/app/shell.rc',
1472 # TODO: It would be nice to have these pulled in 1472 # TODO: It would be nice to have these pulled in automatically
1473 # automatically from direct_dependent_settings in 1473 # from direct_dependent_settings in their various targets, but
1474 # their various targets (net.gyp:net_resources, etc.), 1474 # that causes errors in other targets when resulting .res files
1475 # but that causes errors in other targets when 1475 # get referenced multiple times.
1476 # resulting .res files get referenced multiple times.
1477 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc', 1476 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
1478 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_ en-US.rc', 1477 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_ en-US.rc',
1479 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1480 ], 1478 ],
1481 'dependencies': [ 1479 'dependencies': [
1482 '<(DEPTH)/content/app/resources/content_resources.gyp:content_re sources', 1480 '<(DEPTH)/content/app/resources/content_resources.gyp:content_re sources',
1483 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string s', 1481 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string s',
1484 '<(DEPTH)/net/net.gyp:net_resources', 1482 '<(DEPTH)/net/net.gyp:net_resources',
1485 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources', 1483 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources',
1486 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 1484 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
1487 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 1485 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
1488 ], 1486 ],
1489 'configurations': { 1487 'configurations': {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 'invalidation/impl/android/junit/', 1598 'invalidation/impl/android/junit/',
1601 'policy/android/junit/' 1599 'policy/android/junit/'
1602 ], 1600 ],
1603 }, 1601 },
1604 'includes': [ '../build/host_jar.gypi' ], 1602 'includes': [ '../build/host_jar.gypi' ],
1605 }, 1603 },
1606 ], 1604 ],
1607 }], 1605 }],
1608 ], 1606 ],
1609 } 1607 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/gpu/test_support_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698