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

Side by Side Diff: chrome/chrome.gyp

Issue 506483002: ui: Move ui_unittests.gyp into ui/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 3 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 | « build/android/pylib/gtest/setup.py ('k') | ui/base/ui_base_tests.gyp » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 # core unittests that are otherwise only accessible side-by-side with 436 # core unittests that are otherwise only accessible side-by-side with
437 # chrome via all/all.sln. 437 # chrome via all/all.sln.
438 'target_name': 'test_targets', 438 'target_name': 'test_targets',
439 'type': 'none', 439 'type': 'none',
440 'dependencies': [ 440 'dependencies': [
441 '../base/base.gyp:base_unittests', 441 '../base/base.gyp:base_unittests',
442 '../content/content_shell_and_tests.gyp:content_browsertests', 442 '../content/content_shell_and_tests.gyp:content_browsertests',
443 '../content/content_shell_and_tests.gyp:content_shell', 443 '../content/content_shell_and_tests.gyp:content_shell',
444 '../content/content_shell_and_tests.gyp:content_unittests', 444 '../content/content_shell_and_tests.gyp:content_unittests',
445 '../net/net.gyp:net_unittests', 445 '../net/net.gyp:net_unittests',
446 '../ui/ui_unittests.gyp:ui_unittests', 446 '../ui/base/ui_base_tests.gyp:ui_unittests',
447 ], 447 ],
448 }, 448 },
449 { 449 {
450 'target_name': 'chrome_version_resources', 450 'target_name': 'chrome_version_resources',
451 'type': 'none', 451 'type': 'none',
452 'conditions': [ 452 'conditions': [
453 ['branding == "Chrome"', { 453 ['branding == "Chrome"', {
454 'variables': { 454 'variables': {
455 'branding_path': 'app/theme/google_chrome/BRANDING', 455 'branding_path': 'app/theme/google_chrome/BRANDING',
456 }, 456 },
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 'sources': [ 771 'sources': [
772 'service/cloud_print/print_system_dummy.cc', 772 'service/cloud_print/print_system_dummy.cc',
773 ], 773 ],
774 }], 774 }],
775 ], 775 ],
776 }, 776 },
777 ], 777 ],
778 }], 778 }],
779 ], # 'conditions' 779 ], # 'conditions'
780 } 780 }
OLDNEW
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698