OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
8 # 'branding_dir' is set in the 'conditions' section at the bottom. | 8 # 'branding_dir' is set in the 'conditions' section at the bottom. |
9 }, | 9 }, |
10 'conditions': [ | 10 'conditions': [ |
11 ['OS=="win"', { | 11 ['OS=="win"', { |
grt (UTC plus 2)
2011/11/11 17:01:01
now that this relies on base, gcapi_dll can only b
robertshield
2011/11/12 05:25:38
Meaning that gcapi_dll wouldn't be present in the
grt (UTC plus 2)
2011/11/14 14:24:09
Nod. I agree that it would be strange to special-
| |
12 'targets': [ | 12 'targets': [ |
13 { | 13 { |
14 'target_name': 'gcapi_dll', | 14 'target_name': 'gcapi_dll', |
15 'type': 'loadable_module', | 15 'type': 'loadable_module', |
16 'dependencies': [ | 16 'dependencies': [ |
17 'installer_util', | |
18 '<(DEPTH)/base/base.gyp:base', | |
17 '<(DEPTH)/google_update/google_update.gyp:google_update', | 19 '<(DEPTH)/google_update/google_update.gyp:google_update', |
18 ], | 20 ], |
19 'include_dirs': [ | 21 'include_dirs': [ |
20 '<(DEPTH)', | 22 '<(DEPTH)', |
21 ], | 23 ], |
22 'sources': [ | 24 'sources': [ |
23 'installer/gcapi/gcapi.cc', | 25 'installer/gcapi/gcapi.cc', |
24 'installer/gcapi/gcapi.h', | 26 'installer/gcapi/gcapi.h', |
25 ], | 27 ], |
26 }, | 28 }, |
27 { | 29 { |
28 'target_name': 'gcapi_lib', | 30 'target_name': 'gcapi_lib', |
29 'type': 'static_library', | 31 'type': 'static_library', |
30 'dependencies': [ | 32 'dependencies': [ |
33 'installer_util', | |
grt (UTC plus 2)
2011/11/11 17:01:01
why doesn't this also depend on base like gcapi_dl
robertshield
2011/11/12 05:25:38
It does, I just forgot to add it. It likely builds
| |
31 '<(DEPTH)/google_update/google_update.gyp:google_update', | 34 '<(DEPTH)/google_update/google_update.gyp:google_update', |
32 ], | 35 ], |
33 'include_dirs': [ | 36 'include_dirs': [ |
34 '<(DEPTH)', | 37 '<(DEPTH)', |
35 ], | 38 ], |
36 'sources': [ | 39 'sources': [ |
37 'installer/gcapi/gcapi.cc', | 40 'installer/gcapi/gcapi.cc', |
38 'installer/gcapi/gcapi.h', | 41 'installer/gcapi/gcapi.h', |
39 ], | 42 ], |
40 }, | 43 }, |
41 { | 44 { |
42 'target_name': 'gcapi_test', | 45 'target_name': 'gcapi_test', |
43 'type': 'executable', | 46 'type': 'executable', |
44 'dependencies': [ | 47 'dependencies': [ |
48 'common', | |
45 'gcapi_dll', | 49 'gcapi_dll', |
46 'gcapi_lib', | 50 'gcapi_lib', |
51 'installer_util', | |
52 '<(DEPTH)/base/base.gyp:base', | |
53 '<(DEPTH)/base/base.gyp:test_support_base', | |
54 '<(DEPTH)/testing/gtest.gyp:gtest', | |
47 ], | 55 ], |
48 'include_dirs': [ | 56 'include_dirs': [ |
49 '<(DEPTH)', | 57 '<(DEPTH)', |
50 ], | 58 ], |
51 'sources': [ | 59 'sources': [ |
60 'installer/gcapi/gcapi_last_run_test.cc', | |
52 'installer/gcapi/gcapi_test.cc', | 61 'installer/gcapi/gcapi_test.cc', |
53 'installer/gcapi/gcapi_test.rc', | 62 'installer/gcapi/gcapi_test.rc', |
54 'installer/gcapi/resource.h', | 63 'installer/gcapi/resource.h', |
55 ], | 64 ], |
56 }, | 65 }, |
57 { | 66 { |
58 'target_name': 'installer_util_unittests', | 67 'target_name': 'installer_util_unittests', |
59 'type': 'executable', | 68 'type': 'executable', |
60 'dependencies': [ | 69 'dependencies': [ |
61 'installer_util', | 70 'installer_util', |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
923 'variables': { | 932 'variables': { |
924 'branding_dir': 'app/theme/google_chrome', | 933 'branding_dir': 'app/theme/google_chrome', |
925 }, | 934 }, |
926 }, { # else branding!="Chrome" | 935 }, { # else branding!="Chrome" |
927 'variables': { | 936 'variables': { |
928 'branding_dir': 'app/theme/chromium', | 937 'branding_dir': 'app/theme/chromium', |
929 }, | 938 }, |
930 }], | 939 }], |
931 ], | 940 ], |
932 } | 941 } |
OLD | NEW |