OLD | NEW |
---|---|
1 # Copyright 2012 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 { | 5 { |
6 'targets': [ | 6 'targets': [ |
7 { | 7 { |
8 'target_name': 'browser', | 8 'target_name': 'browser', |
9 'type': 'static_library', | 9 'type': 'static_library', |
10 'variables': { 'enable_wexit_time_destructors': 1, }, | 10 'variables': { 'enable_wexit_time_destructors': 1, }, |
11 'dependencies': [ | 11 'dependencies': [ |
(...skipping 14 matching lines...) Expand all Loading... | |
26 'safe_browsing_proto', | 26 'safe_browsing_proto', |
27 'safe_browsing_report_proto', | 27 'safe_browsing_report_proto', |
28 'variations_seed_proto', | 28 'variations_seed_proto', |
29 '../build/temp_gyp/googleurl.gyp:googleurl', | 29 '../build/temp_gyp/googleurl.gyp:googleurl', |
30 '../content/content.gyp:content_browser', | 30 '../content/content.gyp:content_browser', |
31 '../content/content.gyp:content_common', | 31 '../content/content.gyp:content_common', |
32 '../crypto/crypto.gyp:crypto', | 32 '../crypto/crypto.gyp:crypto', |
33 '../google_apis/google_apis.gyp:google_apis', | 33 '../google_apis/google_apis.gyp:google_apis', |
34 '../media/media.gyp:media', | 34 '../media/media.gyp:media', |
35 '../skia/skia.gyp:skia', | 35 '../skia/skia.gyp:skia', |
36 '../sync/protocol/sync_proto.gyp:sync_proto', | 36 '../sql/sql.gyp:sql', |
37 # TODO(akalin): Depend only on sync_api from sync. | 37 # TODO(akalin): Depend only on sync_api from sync. |
38 '../sync/sync.gyp:sync_core', | |
tim (not reviewing)
2013/01/22 23:29:59
Can you update the todo to mention that sync_core
Raghu Simha
2013/01/23 03:43:46
This is now moot. Targets outside sync.gyp should
| |
38 '../sync/sync.gyp:sync_api', | 39 '../sync/sync.gyp:sync_api', |
39 '../sync/sync.gyp:sync_internal_api', | 40 '../sync/sync.gyp:sync_internal_api', |
40 '../sync/sync.gyp:sync_notifier', | 41 '../sync/sync.gyp:sync_notifier', |
41 '../ui/ui.gyp:shell_dialogs', | 42 '../sync/sync.gyp:sync_proto', |
Ryan Sleevi
2013/01/23 01:05:20
If I understand your CL description, this should j
Raghu Simha
2013/01/23 03:43:46
I had tried rationalizing this in my response to F
| |
42 '../third_party/bzip2/bzip2.gyp:bzip2', | 43 '../third_party/bzip2/bzip2.gyp:bzip2', |
43 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', | 44 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', |
44 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', | 45 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', |
45 '../third_party/icu/icu.gyp:icui18n', | 46 '../third_party/icu/icu.gyp:icui18n', |
46 '../third_party/icu/icu.gyp:icuuc', | 47 '../third_party/icu/icu.gyp:icuuc', |
47 '../third_party/libxml/libxml.gyp:libxml', | 48 '../third_party/libxml/libxml.gyp:libxml', |
48 '../third_party/zlib/zlib.gyp:minizip', | 49 '../third_party/zlib/zlib.gyp:minizip', |
49 '../third_party/zlib/zlib.gyp:zlib', | 50 '../third_party/zlib/zlib.gyp:zlib', |
50 '../ui/base/strings/ui_strings.gyp:ui_strings', | 51 '../ui/base/strings/ui_strings.gyp:ui_strings', |
52 '../ui/ui.gyp:shell_dialogs', | |
51 '../ui/ui.gyp:ui', | 53 '../ui/ui.gyp:ui', |
52 '../ui/ui.gyp:ui_resources', | 54 '../ui/ui.gyp:ui_resources', |
53 '../webkit/support/webkit_support.gyp:user_agent', | 55 '../webkit/support/webkit_support.gyp:user_agent', |
54 ], | 56 ], |
55 'include_dirs': [ | 57 'include_dirs': [ |
56 '..', | 58 '..', |
57 '<(INTERMEDIATE_DIR)', | 59 '<(INTERMEDIATE_DIR)', |
58 # Needed by pepper_flash_component_installer.cc. | 60 # Needed by pepper_flash_component_installer.cc. |
59 '<(SHARED_INTERMEDIATE_DIR)', | 61 '<(SHARED_INTERMEDIATE_DIR)', |
60 ], | 62 ], |
61 'export_dependent_settings': [ | 63 'export_dependent_settings': [ |
64 '../sql/sql.gyp:sql', | |
62 '../sync/sync.gyp:sync_notifier', | 65 '../sync/sync.gyp:sync_notifier', |
Ryan Sleevi
2013/01/23 01:05:20
same here - why not ../sync/sync.gyp:sync
Raghu Simha
2013/01/23 03:43:46
Done.
| |
63 ], | 66 ], |
64 'sources': [ | 67 'sources': [ |
65 # All .cc, .h, .m, and .mm files under browser except for: | 68 # All .cc, .h, .m, and .mm files under browser except for: |
66 # * tests and mocks. | 69 # * tests and mocks. |
67 # * code below browser/chromeos | 70 # * code below browser/chromeos |
68 # * code below browser/extensions | 71 # * code below browser/extensions |
69 'browser/about_flags.cc', | 72 'browser/about_flags.cc', |
70 'browser/about_flags.h', | 73 'browser/about_flags.h', |
71 'browser/accessibility/accessibility_extension_api_constants.cc', | 74 'browser/accessibility/accessibility_extension_api_constants.cc', |
72 'browser/accessibility/accessibility_extension_api_constants.h', | 75 'browser/accessibility/accessibility_extension_api_constants.h', |
(...skipping 3058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3131 'variables': { | 3134 'variables': { |
3132 'jni_gen_dir': 'chrome', | 3135 'jni_gen_dir': 'chrome', |
3133 }, | 3136 }, |
3134 'includes': [ '../build/jni_generator.gypi' ], | 3137 'includes': [ '../build/jni_generator.gypi' ], |
3135 }, | 3138 }, |
3136 ], | 3139 ], |
3137 }, | 3140 }, |
3138 ], | 3141 ], |
3139 ], | 3142 ], |
3140 } | 3143 } |
OLD | NEW |