OLD | NEW |
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 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
869 '../base/base.gyp:base_unittests', | 869 '../base/base.gyp:base_unittests', |
870 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | 870 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', |
871 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | 871 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', |
872 '../content/content.gyp:content_browsertests', | 872 '../content/content.gyp:content_browsertests', |
873 '../content/content.gyp:content_shell', | 873 '../content/content.gyp:content_shell', |
874 '../content/content.gyp:content_unittests', | 874 '../content/content.gyp:content_unittests', |
875 '../net/net.gyp:net_unittests', | 875 '../net/net.gyp:net_unittests', |
876 '../ui/ui.gyp:ui_unittests', | 876 '../ui/ui.gyp:ui_unittests', |
877 ], | 877 ], |
878 'conditions': [ | 878 'conditions': [ |
879 ['use_aura==1', { | 879 ['use_aura==1 or target_arch=="x64"', { |
880 'dependencies!': [ | 880 'dependencies!': [ |
881 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | 881 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', |
882 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | 882 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', |
883 ], | 883 ], |
884 }], | 884 }], |
885 ], | 885 ], |
886 }, | 886 }, |
887 { | 887 { |
888 'target_name': 'chrome_version_resources', | 888 'target_name': 'chrome_version_resources', |
889 'type': 'none', | 889 'type': 'none', |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1097 '../build/java.gypi', | 1097 '../build/java.gypi', |
1098 ], | 1098 ], |
1099 }, | 1099 }, |
1100 ], # 'targets' | 1100 ], # 'targets' |
1101 'includes': [ | 1101 'includes': [ |
1102 'chrome_android.gypi', | 1102 'chrome_android.gypi', |
1103 ]}, # 'includes' | 1103 ]}, # 'includes' |
1104 ], # OS=="android" | 1104 ], # OS=="android" |
1105 ], # 'conditions' | 1105 ], # 'conditions' |
1106 } | 1106 } |
OLD | NEW |