| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//tools/grit/grit_rule.gni") | 8 import("//tools/grit/grit_rule.gni") |
| 9 | 9 |
| 10 about_credits_file = "$target_gen_dir/about_credits.html" | 10 about_credits_file = "$target_gen_dir/about_credits.html" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 "//base/allocator", | 33 "//base/allocator", |
| 34 "//chrome:extra_resources", | 34 "//chrome:extra_resources", |
| 35 "//chrome:resources", | 35 "//chrome:resources", |
| 36 "//chrome:strings", | 36 "//chrome:strings", |
| 37 "//chrome/app:generated_resources_map", | 37 "//chrome/app:generated_resources_map", |
| 38 "//chrome/app/theme:theme_resources", | 38 "//chrome/app/theme:theme_resources", |
| 39 "//chrome/browser/net:probe_message_proto", | 39 "//chrome/browser/net:probe_message_proto", |
| 40 "//chrome/browser/search/suggestions/proto", | 40 "//chrome/browser/search/suggestions/proto", |
| 41 "//chrome/common", | 41 "//chrome/common", |
| 42 "//chrome/common/net", | 42 "//chrome/common/net", |
| 43 "//components/autofill/core/browser", |
| 43 "//components/cloud_devices/common", | 44 "//components/cloud_devices/common", |
| 44 "//components/metrics:net", | 45 "//components/metrics:net", |
| 45 "//components/navigation_metrics", | 46 "//components/navigation_metrics", |
| 46 "//components/os_crypt", | 47 "//components/os_crypt", |
| 47 "//components/policy:policy_component", | 48 "//components/policy:policy_component", |
| 48 "//components/query_parser", | 49 "//components/query_parser", |
| 49 "//components/strings", | 50 "//components/strings", |
| 50 "//components/translate:translate_core_browser", | 51 "//components/translate:translate_core_browser", |
| 51 "//components/translate:translate_core_common", | 52 "//components/translate:translate_core_common", |
| 52 "//components/user_prefs", | 53 "//components/user_prefs", |
| 53 "//content/public/browser", | 54 "//content/public/browser", |
| 54 "//content/public/common", | 55 "//content/public/common", |
| 56 "//courgette:courgette_lib", |
| 55 "//crypto", | 57 "//crypto", |
| 58 "//google_apis", |
| 56 "//skia", | 59 "//skia", |
| 57 "//sql", | 60 "//sql", |
| 58 "//sync", | 61 "//sync", |
| 59 "//third_party/cacheinvalidation", | 62 "//third_party/cacheinvalidation", |
| 60 "//third_party/icu", | 63 "//third_party/icu", |
| 61 "//third_party/libxml", | 64 "//third_party/libxml", |
| 62 "//third_party/widevine/cdm:version_h", | 65 "//third_party/widevine/cdm:version_h", |
| 63 "//third_party/zlib", | 66 "//third_party/zlib", |
| 64 "//third_party/zlib:minizip", | 67 "//third_party/zlib:minizip", |
| 65 "//third_party/zlib:zip", | 68 "//third_party/zlib:zip", |
| 66 "//ui/base", | 69 "//ui/base", |
| 67 "//ui/events", | 70 "//ui/events", |
| 68 "//ui/gfx", | 71 "//ui/gfx", |
| 69 "//ui/gfx/geometry", | 72 "//ui/gfx/geometry", |
| 70 "//ui/strings", | 73 "//ui/strings", |
| 71 "//ui/resources", | 74 "//ui/resources", |
| 72 # TODO(GYP) | 75 # TODO(GYP) |
| 73 #"browser_ui", | 76 #"browser_ui", |
| 74 #"cert_logger_proto", | 77 #"cert_logger_proto", |
| 75 #"chrome_resources.gyp:platform_locale_settings", | 78 #"chrome_resources.gyp:platform_locale_settings", |
| 76 #"in_memory_url_index_cache_proto", | 79 #"in_memory_url_index_cache_proto", |
| 77 #"../components/components.gyp:autocomplete", | 80 #"../components/components.gyp:autocomplete", |
| 78 #"../components/components.gyp:autofill_core_browser", | |
| 79 #"../components/components.gyp:bookmarks_browser", | 81 #"../components/components.gyp:bookmarks_browser", |
| 80 #"../components/components.gyp:captive_portal", | 82 #"../components/components.gyp:captive_portal", |
| 81 #"../components/components.gyp:data_reduction_proxy_browser", | 83 #"../components/components.gyp:data_reduction_proxy_browser", |
| 82 #"../components/components.gyp:domain_reliability", | 84 #"../components/components.gyp:domain_reliability", |
| 83 #"../components/components.gyp:favicon_base", | 85 #"../components/components.gyp:favicon_base", |
| 84 #"../components/components.gyp:favicon_core", | 86 #"../components/components.gyp:favicon_core", |
| 85 #"../components/components.gyp:feedback_component", | 87 #"../components/components.gyp:feedback_component", |
| 86 #"../components/components.gyp:gcm_driver", | 88 #"../components/components.gyp:gcm_driver", |
| 87 #"../components/components.gyp:google_core_browser", | 89 #"../components/components.gyp:google_core_browser", |
| 88 #"../components/components.gyp:history_core_browser", | 90 #"../components/components.gyp:history_core_browser", |
| 89 #"../components/components.gyp:history_core_common", | 91 #"../components/components.gyp:history_core_common", |
| 90 #"../components/components.gyp:infobars_core", | 92 #"../components/components.gyp:infobars_core", |
| 91 #"../components/components.gyp:invalidation", | 93 #"../components/components.gyp:invalidation", |
| 92 #"../components/components.gyp:network_time", | 94 #"../components/components.gyp:network_time", |
| 93 #"../components/components.gyp:omaha_query_params", | 95 #"../components/components.gyp:omaha_query_params", |
| 94 #"../components/components.gyp:password_manager_core_browser", | 96 #"../components/components.gyp:password_manager_core_browser", |
| 95 #"../components/components.gyp:password_manager_core_common", | 97 #"../components/components.gyp:password_manager_core_common", |
| 96 #"../components/components.gyp:precache_core", | 98 #"../components/components.gyp:precache_core", |
| 97 #"../components/components.gyp:rappor", | 99 #"../components/components.gyp:rappor", |
| 98 #"../components/components.gyp:search_engines", | 100 #"../components/components.gyp:search_engines", |
| 99 #"../components/components.gyp:search_provider_logos", | 101 #"../components/components.gyp:search_provider_logos", |
| 100 #"../components/components.gyp:signin_core_browser", | 102 #"../components/components.gyp:signin_core_browser", |
| 101 #"../components/components.gyp:startup_metric_utils", | 103 #"../components/components.gyp:startup_metric_utils", |
| 102 #"../components/components.gyp:sync_driver", | 104 #"../components/components.gyp:sync_driver", |
| 103 #"../components/components.gyp:url_fixer", | 105 #"../components/components.gyp:url_fixer", |
| 104 #"../components/components.gyp:webdata_common", | 106 #"../components/components.gyp:webdata_common", |
| 105 #"../courgette/courgette.gyp:courgette_lib", | |
| 106 #"../google_apis/google_apis.gyp:google_apis", | |
| 107 #"../jingle/jingle.gyp:notifier", | 107 #"../jingle/jingle.gyp:notifier", |
| 108 #"../third_party/libjingle/libjingle.gyp:libjingle", | 108 #"../third_party/libjingle/libjingle.gyp:libjingle", |
| 109 #"../ui/message_center/message_center.gyp:message_center", | 109 #"../ui/message_center/message_center.gyp:message_center", |
| 110 #"../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs", | 110 #"../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs", |
| 111 # Note: variations dependency from GYP build is omitted because we pick it | 111 # Note: variations dependency from GYP build is omitted because we pick it |
| 112 # up via chrome/common, and GN doesn't have the GYP dependency bug that | 112 # up via chrome/common, and GN doesn't have the GYP dependency bug that |
| 113 # made it necessary to include here. | 113 # made it necessary to include here. |
| 114 ] | 114 ] |
| 115 | 115 |
| 116 forward_dependent_configs_from = [ | 116 forward_dependent_configs_from = [ |
| (...skipping 18 matching lines...) Expand all Loading... |
| 135 | 135 |
| 136 # TODO(GYP) Also add these nacl_defines to direct dependents. | 136 # TODO(GYP) Also add these nacl_defines to direct dependents. |
| 137 #defines = nacl_defines | 137 #defines = nacl_defines |
| 138 | 138 |
| 139 # TODO(GYP) remove this when the real webrtc target is used below. | 139 # TODO(GYP) remove this when the real webrtc target is used below. |
| 140 configs += [ "//content:webrtc_stub_config" ] | 140 configs += [ "//content:webrtc_stub_config" ] |
| 141 | 141 |
| 142 deps += [ | 142 deps += [ |
| 143 "//cc", | 143 "//cc", |
| 144 "//chrome/browser/performance_monitor", | 144 "//chrome/browser/performance_monitor", |
| 145 "//chrome/common/extensions/api:api", |
| 145 "//components/keyed_service/content", | 146 "//components/keyed_service/content", |
| 146 "//components/url_matcher", | 147 "//components/url_matcher", |
| 147 "//components/visitedlink/browser", | 148 "//components/visitedlink/browser", |
| 148 "//components/visitedlink/common", | 149 "//components/visitedlink/common", |
| 150 "//mojo/environment:chromium", |
| 151 "//mojo/public/cpp/bindings", |
| 152 "//mojo/public/js/bindings", |
| 153 "//mojo/system", |
| 149 "//net:net_with_v8", | 154 "//net:net_with_v8", |
| 150 "//third_party/adobe/flash:flapper_version_h", | 155 "//third_party/adobe/flash:flapper_version_h", |
| 151 "//third_party/expat", | 156 "//third_party/expat", |
| 152 "//third_party/leveldatabase", | 157 "//third_party/leveldatabase", |
| 153 "//third_party/libaddressinput", | 158 "//third_party/libaddressinput", |
| 154 "//third_party/libyuv", | 159 "//third_party/libyuv", |
| 155 "//third_party/npapi", | 160 "//third_party/npapi", |
| 156 "//third_party/re2", | 161 "//third_party/re2", |
| 157 "//third_party/smhasher:cityhash", | 162 "//third_party/smhasher:cityhash", |
| 158 "//ui/gl", | 163 "//ui/gl", |
| 159 "//ui/surface", | 164 "//ui/surface", |
| 165 "//ui/web_dialogs", |
| 160 "//v8", | 166 "//v8", |
| 161 "//webkit:resources", | 167 "//webkit:resources", |
| 162 "//webkit/browser:storage", | 168 "//webkit/browser:storage", |
| 163 "//webkit/common", | 169 "//webkit/common", |
| 164 "//webkit/common:storage", | 170 "//webkit/common:storage", |
| 165 # TODO(GYP) | 171 # TODO(GYP) |
| 166 #"apps", | 172 #"apps", |
| 167 #"browser_extensions", | 173 #"browser_extensions", |
| 168 #"common/extensions/api/api.gyp:chrome_api", | |
| 169 #"debugger", | 174 #"debugger", |
| 170 #"installer_util", | 175 #"installer_util", |
| 171 #"sync_file_system_drive_proto", | 176 #"sync_file_system_drive_proto", |
| 172 #"sync_file_system_proto", | 177 #"sync_file_system_proto", |
| 173 #"../components/components.gyp:autofill_content_browser", | 178 #"../components/components.gyp:autofill_content_browser", |
| 174 #"../components/components.gyp:dom_distiller_content", | 179 #"../components/components.gyp:dom_distiller_content", |
| 175 #"../components/components.gyp:navigation_interception", | 180 #"../components/components.gyp:navigation_interception", |
| 176 #"../components/components.gyp:password_manager_content_browser", | 181 #"../components/components.gyp:password_manager_content_browser", |
| 177 #"../components/components.gyp:precache_content", | 182 #"../components/components.gyp:precache_content", |
| 178 #"../components/components.gyp:sessions", | 183 #"../components/components.gyp:sessions", |
| 179 #"../components/components.gyp:storage_monitor", | 184 #"../components/components.gyp:storage_monitor", |
| 180 #"../components/components.gyp:translate_content_browser", | 185 #"../components/components.gyp:translate_content_browser", |
| 181 #"../components/components.gyp:usb_service", | 186 #"../components/components.gyp:usb_service", |
| 182 #"../components/components.gyp:web_modal", | 187 #"../components/components.gyp:web_modal", |
| 183 #"../media/cast/cast.gyp:cast_transport", | 188 #"../media/cast/cast.gyp:cast_transport", |
| 184 #"../media/media.gyp:media", | 189 #"../media/media.gyp:media", |
| 185 #"../mojo/mojo.gyp:mojo_cpp_bindings", | |
| 186 #"../mojo/mojo.gyp:mojo_environment_chromium", | |
| 187 #"../mojo/mojo.gyp:mojo_js_bindings", | |
| 188 #"../mojo/mojo.gyp:mojo_system_impl", | |
| 189 ## TODO(tonyg): Remove this dependency (crbug.com/280157). | 190 ## TODO(tonyg): Remove this dependency (crbug.com/280157). |
| 190 #"../testing/perf/perf_test.gyp:*", | 191 #"../testing/perf/perf_test.gyp:*", |
| 191 # Note: for this one also remove the webrtc_stub_config | 192 # Note: for this one also remove the webrtc_stub_config |
| 192 #"../third_party/webrtc/modules/modules.gyp:desktop_capture", | 193 #"../third_party/webrtc/modules/modules.gyp:desktop_capture", |
| 193 #"../ui/web_dialogs/web_dialogs.gyp:web_dialogs", | |
| 194 ] | 194 ] |
| 195 } else { # iOS | 195 } else { # iOS |
| 196 sources += rebase_path(gypi_values.chrome_browser_ios_sources, | 196 sources += rebase_path(gypi_values.chrome_browser_ios_sources, |
| 197 ".", "//chrome") | 197 ".", "//chrome") |
| 198 deps += [ | 198 deps += [ |
| 199 "//net", | 199 "//net", |
| 200 ] | 200 ] |
| 201 libs += [ | 201 libs += [ |
| 202 "CoreTelephony.framework", | 202 "CoreTelephony.framework", |
| 203 "CoreText.framework", | 203 "CoreText.framework", |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 } | 263 } |
| 264 # ["debug_devtools==1", { TODO(GYP) | 264 # ["debug_devtools==1", { TODO(GYP) |
| 265 # "defines": [ | 265 # "defines": [ |
| 266 # "DEBUG_DEVTOOLS=1", | 266 # "DEBUG_DEVTOOLS=1", |
| 267 # ], | 267 # ], |
| 268 if (enable_configuration_policy) { | 268 if (enable_configuration_policy) { |
| 269 sources += rebase_path( | 269 sources += rebase_path( |
| 270 gypi_values.chrome_browser_policy_shared_with_ios_sources, | 270 gypi_values.chrome_browser_policy_shared_with_ios_sources, |
| 271 ".", "//chrome") | 271 ".", "//chrome") |
| 272 deps += [ | 272 deps += [ |
| 273 "//components/policy", |
| 273 "//components/policy/proto", | 274 "//components/policy/proto", |
| 274 #"../components/components.gyp:policy", TODO(GYP) | |
| 275 ] | 275 ] |
| 276 if (!is_ios) { | 276 if (!is_ios) { |
| 277 sources += rebase_path( | 277 sources += rebase_path( |
| 278 gypi_values.chrome_browser_policy_non_ios_sources, | 278 gypi_values.chrome_browser_policy_non_ios_sources, |
| 279 ".", "//chrome") | 279 ".", "//chrome") |
| 280 } | 280 } |
| 281 if (!is_chromeos) { | 281 if (!is_chromeos) { |
| 282 sources += rebase_path( | 282 sources += rebase_path( |
| 283 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources
, | 283 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources
, |
| 284 ".", "//chrome") | 284 ".", "//chrome") |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 deps += [ | 343 deps += [ |
| 344 #"browser_chromeos", TODO(GYP) | 344 #"browser_chromeos", TODO(GYP) |
| 345 ] | 345 ] |
| 346 } else { | 346 } else { |
| 347 # Non-ChromeOS. | 347 # Non-ChromeOS. |
| 348 sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources, | 348 sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources, |
| 349 ".", "//chrome") | 349 ".", "//chrome") |
| 350 } | 350 } |
| 351 | 351 |
| 352 if (use_cups) { | 352 if (use_cups) { |
| 353 #deps += [ "../printing/printing.gyp:cups" ] TODO(GYP) | 353 configs += [ "//printing:cups" ] |
| 354 } | 354 } |
| 355 if (is_desktop_linux) { | 355 if (is_desktop_linux) { |
| 356 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, | 356 sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources, |
| 357 ".", "//chrome") | 357 ".", "//chrome") |
| 358 configs += [ "//build/config/linux:gnome_keyring" ] | 358 configs += [ "//build/config/linux:gnome_keyring" ] |
| 359 } | 359 } |
| 360 if (use_aura) { | 360 if (use_aura) { |
| 361 sources += rebase_path(gypi_values.chrome_browser_aura_sources, | 361 sources += rebase_path(gypi_values.chrome_browser_aura_sources, |
| 362 ".", "//chrome") | 362 ".", "//chrome") |
| 363 deps += [ | 363 deps += [ |
| 364 "//ui/aura", | 364 "//ui/aura", |
| 365 "//ui/compositor", | 365 "//ui/compositor", |
| 366 #"../ui/keyboard/keyboard.gyp:keyboard", TODO(GYP) | 366 "//ui/keyboard", |
| 367 ] | 367 ] |
| 368 } | 368 } |
| 369 if (ui_compositor_image_transport) { | 369 if (ui_compositor_image_transport) { |
| 370 deps += [ "//ui/gl" ] | 370 deps += [ "//ui/gl" ] |
| 371 } | 371 } |
| 372 | 372 |
| 373 if (use_x11) { | 373 if (use_x11) { |
| 374 sources += rebase_path(gypi_values.chrome_browser_x11_sources, | 374 sources += rebase_path(gypi_values.chrome_browser_x11_sources, |
| 375 ".", "//chrome") | 375 ".", "//chrome") |
| 376 if (!is_chromeos) { | 376 if (!is_chromeos) { |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 # TODO(GYP) write internal action | 654 # TODO(GYP) write internal action |
| 655 if (false) { #if (is_chrome_branded) { | 655 if (false) { #if (is_chrome_branded) { |
| 656 action("chrome_internal_resources_gen") { | 656 action("chrome_internal_resources_gen") { |
| 657 # TODO(GYP) | 657 # TODO(GYP) |
| 658 } | 658 } |
| 659 } else { | 659 } else { |
| 660 group("chrome_internal_resources_gen") { | 660 group("chrome_internal_resources_gen") { |
| 661 # Empty placeholder. | 661 # Empty placeholder. |
| 662 } | 662 } |
| 663 } | 663 } |
| OLD | NEW |