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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome Created 4 years, 7 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
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 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 ], 1806 ],
1807 }], 1807 }],
1808 ['use_aura==0 or chromeos==1', { 1808 ['use_aura==0 or chromeos==1', {
1809 'sources!': [ 1809 'sources!': [
1810 '../ui/views/corewm/desktop_capture_controller_unittest.cc', 1810 '../ui/views/corewm/desktop_capture_controller_unittest.cc',
1811 ], 1811 ],
1812 }], 1812 }],
1813 ['chromeos==1', { 1813 ['chromeos==1', {
1814 'dependencies': [ 1814 'dependencies': [
1815 '../ash/ash_resources.gyp:ash_resources', 1815 '../ash/ash_resources.gyp:ash_resources',
1816 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
1816 '../chromeos/chromeos.gyp:chromeos', 1817 '../chromeos/chromeos.gyp:chromeos',
1817 ], 1818 ],
1818 'conditions': [ 1819 'conditions': [
1819 ['disable_nacl==0 and disable_nacl_untrusted==0', { 1820 ['disable_nacl==0 and disable_nacl_untrusted==0', {
1820 'dependencies': [ 1821 'dependencies': [
1821 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap', 1822 '../native_client/src/trusted/service_runtime/linux/nacl_bootstr ap.gyp:nacl_helper_bootstrap',
1822 '../components/nacl.gyp:nacl_helper', 1823 '../components/nacl.gyp:nacl_helper',
1823 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', 1824 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',
1824 ], 1825 ],
1825 }], 1826 }],
(...skipping 1784 matching lines...) Expand 10 before | Expand all | Expand 10 after
3610 'browser', 3611 'browser',
3611 ], 3612 ],
3612 'sources': [ 3613 'sources': [
3613 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3614 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3614 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3615 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3615 ], 3616 ],
3616 }] 3617 }]
3617 }], 3618 }],
3618 ], # 'conditions' 3619 ], # 'conditions'
3619 } 3620 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698