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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete revived file Created 4 years, 6 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 | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 5 'variables': {
6 'build_angle_deqp_tests%': 0, 6 'build_angle_deqp_tests%': 0,
7 'chrome_browser_extensions_test_support_sources': [ 7 'chrome_browser_extensions_test_support_sources': [
8 # A list of sources which is shared between different browser tests. 8 # A list of sources which is shared between different browser tests.
9 'browser/apps/app_browsertest_util.cc', 9 'browser/apps/app_browsertest_util.cc',
10 'browser/apps/app_browsertest_util.h', 10 'browser/apps/app_browsertest_util.h',
(...skipping 1800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1811 ], 1811 ],
1812 }], 1812 }],
1813 ['use_aura==0 or chromeos==1', { 1813 ['use_aura==0 or chromeos==1', {
1814 'sources!': [ 1814 'sources!': [
1815 '../ui/views/corewm/desktop_capture_controller_unittest.cc', 1815 '../ui/views/corewm/desktop_capture_controller_unittest.cc',
1816 ], 1816 ],
1817 }], 1817 }],
1818 ['chromeos==1', { 1818 ['chromeos==1', {
1819 'dependencies': [ 1819 'dependencies': [
1820 '../ash/ash_resources.gyp:ash_resources', 1820 '../ash/ash_resources.gyp:ash_resources',
1821 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
1822 '../chromeos/chromeos.gyp:chromeos', 1821 '../chromeos/chromeos.gyp:chromeos',
1823 ], 1822 ],
1824 'conditions': [ 1823 'conditions': [
1825 ['disable_nacl==0 and disable_nacl_untrusted==0', { 1824 ['disable_nacl==0 and disable_nacl_untrusted==0', {
1826 'dependencies': [ 1825 'dependencies': [
1827 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 1826 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
1828 '../components/nacl.gyp:nacl_helper', 1827 '../components/nacl.gyp:nacl_helper',
1829 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', 1828 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
1830 ], 1829 ],
1831 }], 1830 }],
(...skipping 1781 matching lines...) Expand 10 before | Expand all | Expand 10 after
3613 'browser', 3612 'browser',
3614 ], 3613 ],
3615 'sources': [ 3614 'sources': [
3616 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3615 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3617 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3616 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3618 ], 3617 ],
3619 }] 3618 }]
3620 }], 3619 }],
3621 ], # 'conditions' 3620 ], # 'conditions'
3622 } 3621 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698