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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
OLDNEW
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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 rebase_path(gypi_values.chrome_browser_session_sources, ".", "//chrome") 237 rebase_path(gypi_values.chrome_browser_session_sources, ".", "//chrome")
238 sources += 238 sources +=
239 rebase_path(gypi_values.chrome_browser_signin_sources, ".", "//chrome") 239 rebase_path(gypi_values.chrome_browser_signin_sources, ".", "//chrome")
240 sources += 240 sources +=
241 rebase_path(gypi_values.chrome_browser_ssl_sources, ".", "//chrome") 241 rebase_path(gypi_values.chrome_browser_ssl_sources, ".", "//chrome")
242 sources += 242 sources +=
243 rebase_path(gypi_values.chrome_browser_sync_sources, ".", "//chrome") 243 rebase_path(gypi_values.chrome_browser_sync_sources, ".", "//chrome")
244 sources += rebase_path(gypi_values.chrome_browser_web_resource_sources, 244 sources += rebase_path(gypi_values.chrome_browser_web_resource_sources,
245 ".", 245 ".",
246 "//chrome") 246 "//chrome")
247 # if (use_aura) {
248 # sources += [
249 # "android/chrome_main_delegate_staging_android.cc",
250 # "android/chrome_main_delegate_staging_android.h",
251 # "android/chrome_media_client_android.cc",
252 # "android/chrome_media_client_android.h",
253 # "android/chrome_startup_flags.cc",
254 # "android/chrome_startup_flags.h",
255 # "android/chrome_web_contents_delegate_android.cc",
256 # "android/chrome_web_contents_delegate_android.h",
257 # ]
258 # }
259
260 if (!is_android || !use_aura) {
261 sources -= [ "fullscreen_auraandroid.cc", ]
262 }
263 if (is_android && use_aura) {
264 # chrome_browser_non_ios_sources
265 sources -= [
266 "android/accessibility/font_size_prefs_android.cc",
267 "android/accessibility/font_size_prefs_android.h",
268 "android/accessibility_util.cc",
269 "android/accessibility_util.h",
270 # "android/activity_type_ids.cc",
271 # "android/activity_type_ids.h",
272 "android/appmenu/app_menu_drag_helper.cc",
273 "android/appmenu/app_menu_drag_helper.h",
274 "android/banners/app_banner_data_fetcher_android.cc",
275 "android/banners/app_banner_data_fetcher_android.h",
276 "android/banners/app_banner_infobar_delegate_android.cc",
277 "android/banners/app_banner_infobar_delegate_android.h",
278 "android/banners/app_banner_manager_android.cc",
279 "android/banners/app_banner_manager_android.h",
280 "android/bookmarks/bookmarks_bridge.cc",
281 "android/bookmarks/bookmarks_bridge.h",
282 "android/bookmarks/edit_bookmark_helper.cc",
283 "android/bookmarks/edit_bookmark_helper.h",
284 "android/bookmarks/partner_bookmarks_reader.cc",
285 "android/bookmarks/partner_bookmarks_reader.h",
286 "android/bookmarks/partner_bookmarks_shim.cc",
287 "android/bookmarks/partner_bookmarks_shim.h",
288 ## "android/chrome_application.cc",
289 ## "android/chrome_application.h",
290 ## "android/chrome_jni_registrar.cc",
291 ## "android/chrome_jni_registrar.h",
292 ## "android/chrome_main_delegate_staging_android.cc",
293 ## "android/chrome_main_delegate_staging_android.h",
294 ## "android/chrome_media_client_android.cc",
295 ## "android/chrome_media_client_android.h",
296 ## "android/chrome_startup_flags.cc",
297 ## "android/chrome_startup_flags.h",
298 "android/chrome_web_contents_delegate_android.cc",
299 "android/chrome_web_contents_delegate_android.h",
300 "android/compositor/compositor_view.cc",
301 "android/compositor/compositor_view.h",
302 "android/compositor/decoration_title.cc",
303 "android/compositor/decoration_title.h",
304 "android/compositor/layer/content_layer.cc",
305 "android/compositor/layer/content_layer.h",
306 "android/compositor/layer/contextual_search_layer.cc",
307 "android/compositor/layer/contextual_search_layer.h",
308 "android/compositor/layer/layer.h",
309 "android/compositor/layer/reader_mode_layer.cc",
310 "android/compositor/layer/reader_mode_layer.h",
311 "android/compositor/layer/tab_handle_layer.cc",
312 "android/compositor/layer/tab_handle_layer.h",
313 "android/compositor/layer/tab_layer.cc",
314 "android/compositor/layer/tab_layer.h",
315 "android/compositor/layer/throbber_layer.cc",
316 "android/compositor/layer/throbber_layer.h",
317 "android/compositor/layer/thumbnail_layer.cc",
318 "android/compositor/layer/thumbnail_layer.h",
319 "android/compositor/layer/toolbar_layer.cc",
320 "android/compositor/layer/toolbar_layer.h",
321 "android/compositor/layer_title_cache.cc",
322 "android/compositor/layer_title_cache.h",
323 "android/compositor/scene_layer/contextual_search_scene_layer.cc",
324 "android/compositor/scene_layer/contextual_search_scene_layer.h",
325 "android/compositor/scene_layer/reader_mode_scene_layer.cc",
326 "android/compositor/scene_layer/reader_mode_scene_layer.h",
327 "android/compositor/scene_layer/scene_layer.cc",
328 "android/compositor/scene_layer/scene_layer.h",
329 "android/compositor/scene_layer/static_tab_scene_layer.cc",
330 "android/compositor/scene_layer/static_tab_scene_layer.h",
331 "android/compositor/scene_layer/tab_list_scene_layer.cc",
332 "android/compositor/scene_layer/tab_list_scene_layer.h",
333 "android/compositor/scene_layer/tab_strip_scene_layer.cc",
334 "android/compositor/scene_layer/tab_strip_scene_layer.h",
335 "android/compositor/tab_content_manager.cc",
336 "android/compositor/tab_content_manager.h",
337 "android/contextualsearch/contextual_search_context.cc",
338 "android/contextualsearch/contextual_search_context.h",
339 "android/contextualsearch/contextual_search_delegate.cc",
340 "android/contextualsearch/contextual_search_delegate.h",
341 "android/contextualsearch/contextual_search_manager.cc",
342 "android/contextualsearch/contextual_search_manager.h",
343 "android/contextualsearch/contextual_search_tab_helper.cc",
344 "android/contextualsearch/contextual_search_tab_helper.h",
345 # "android/cookies/cookies_fetcher.cc",
346 # "android/cookies/cookies_fetcher.h",
347 # "android/dev_tools_discovery_provider_android.cc",
348 # "android/dev_tools_discovery_provider_android.h",
349 "android/dev_tools_server.cc",
350 "android/dev_tools_server.h",
351 "android/document/document_web_contents_delegate.cc",
352 "android/dom_distiller/external_feedback_reporter_android.cc",
353 "android/dom_distiller/external_feedback_reporter_android.h",
354 "android/download/android_download_manager_overwrite_infobar_delegate.cc",
355 "android/download/android_download_manager_overwrite_infobar_delegate.h",
356 "android/download/chrome_download_delegate.cc",
357 "android/download/chrome_download_delegate.h",
358 "android/download/chrome_download_manager_overwrite_infobar_delegate.cc",
359 "android/download/chrome_download_manager_overwrite_infobar_delegate.h",
360 "android/download/download_overwrite_infobar_delegate.cc",
361 "android/download/download_overwrite_infobar_delegate.h",
362 "android/download/mock_download_controller_android.cc",
363 "android/download/mock_download_controller_android.h",
364 "android/favicon_helper.cc",
365 "android/favicon_helper.h",
366 # "android/feature_utilities.cc",
367 # "android/feature_utilities.h",
368 "android/feedback/connectivity_checker.cc",
369 "android/feedback/connectivity_checker.h",
370 "android/find_in_page/find_in_page_bridge.cc",
371 "android/find_in_page/find_in_page_bridge.h",
372 "android/foreign_session_helper.cc",
373 "android/foreign_session_helper.h",
374 "android/fullscreen/fullscreen_infobar_delegate.cc",
375 "android/fullscreen/fullscreen_infobar_delegate.h",
376 "android/history_report/data_observer.cc",
377 "android/history_report/data_observer.h",
378 "android/history_report/data_provider.cc",
379 "android/history_report/data_provider.h",
380 "android/history_report/delta_file_backend_leveldb.cc",
381 "android/history_report/delta_file_backend_leveldb.h",
382 "android/history_report/delta_file_commons.cc",
383 "android/history_report/delta_file_commons.h",
384 "android/history_report/delta_file_service.cc",
385 "android/history_report/delta_file_service.h",
386 "android/history_report/get_all_urls_from_history_task.cc",
387 "android/history_report/get_all_urls_from_history_task.h",
388 "android/history_report/historic_visits_migration_task.cc",
389 "android/history_report/historic_visits_migration_task.h",
390 "android/history_report/history_report_jni_bridge.cc",
391 "android/history_report/history_report_jni_bridge.h",
392 "android/history_report/usage_report_util.cc",
393 "android/history_report/usage_report_util.h",
394 "android/history_report/usage_reports_buffer_backend.cc",
395 "android/history_report/usage_reports_buffer_backend.h",
396 "android/history_report/usage_reports_buffer_service.cc",
397 "android/history_report/usage_reports_buffer_service.h",
398 # "android/intent_helper.cc",
399 # "android/intent_helper.h",
400 "android/intercept_download_resource_throttle.cc",
401 "android/intercept_download_resource_throttle.h",
402 # "android/java_exception_reporter.cc",
403 # "android/java_exception_reporter.h",
404 "android/large_icon_bridge.cc",
405 "android/large_icon_bridge.h",
406 # "android/location_settings.h",
407 # "android/location_settings_impl.cc",
408 # "android/location_settings_impl.h",
409 # "android/logo_bridge.cc",
410 # "android/logo_bridge.h",
411 # "android/logo_service.cc",
412 # "android/logo_service.h",
413 # "android/metrics/launch_metrics.cc",
414 # "android/metrics/launch_metrics.h",
415 # "android/metrics/uma_session_stats.cc",
416 # "android/metrics/uma_session_stats.h",
417 "android/metrics/uma_utils.cc",
418 "android/metrics/uma_utils.h",
419 # "android/metrics/variations_session.cc",
420 # "android/metrics/variations_session.h",
421 # "android/most_visited_sites.cc",
422 # "android/most_visited_sites.h",
423 # "android/net/network_quality_provider.cc",
424 # "android/net/network_quality_provider.h",
425 "android/new_tab_page_prefs.cc",
426 "android/new_tab_page_prefs.h",
427 "android/new_tab_page_url_handler.cc",
428 "android/new_tab_page_url_handler.h",
429 "android/omnibox/answers_image_bridge.cc",
430 "android/omnibox/answers_image_bridge.h",
431 "android/omnibox/autocomplete_controller_android.cc",
432 "android/omnibox/autocomplete_controller_android.h",
433 "android/omnibox/omnibox_prerender.cc",
434 "android/omnibox/omnibox_prerender.h",
435 "android/password_ui_view_android.cc",
436 "android/password_ui_view_android.h",
437 # "android/popular_sites.cc",
438 # "android/popular_sites.h",
439 # "android/precache/precache_launcher.cc",
440 # "android/precache/precache_launcher.h",
441 "android/preferences/autofill/autofill_profile_bridge.cc",
442 "android/preferences/autofill/autofill_profile_bridge.h",
443 "android/preferences/pref_service_bridge.cc",
444 "android/preferences/pref_service_bridge.h",
445 "android/preferences/website_preference_bridge.cc",
446 "android/preferences/website_preference_bridge.h",
447 "android/profiles/profile_downloader_android.cc",
448 "android/profiles/profile_downloader_android.h",
449 "android/provider/blocking_ui_thread_async_request.cc",
450 "android/provider/blocking_ui_thread_async_request.h",
451 "android/provider/bookmark_model_observer_task.cc",
452 "android/provider/bookmark_model_observer_task.h",
453 "android/provider/chrome_browser_provider.cc",
454 "android/provider/chrome_browser_provider.h",
455 "android/provider/run_on_ui_thread_blocking.h",
456 "android/recently_closed_tabs_bridge.cc",
457 "android/recently_closed_tabs_bridge.h",
458 # "android/resource_id.h",
459 # "android/resource_mapper.cc",
460 # "android/resource_mapper.h",
461 # "android/rlz/revenue_stats.cc",
462 # "android/rlz/revenue_stats.h",
463 # "android/seccomp_support_detector.cc",
464 # "android/seccomp_support_detector.h",
465 # "android/shortcut_data_fetcher.cc",
466 # "android/shortcut_data_fetcher.h",
467 # "android/shortcut_helper.cc",
468 # "android/shortcut_helper.h",
469 # "android/shortcut_info.cc",
470 # "android/shortcut_info.h",
471 # "android/signin/account_management_screen_helper.cc",
472 # "android/signin/account_management_screen_helper.h",
473 "android/signin/signin_manager_android.cc",
474 "android/signin/signin_manager_android.h",
475 "android/tab/thumbnail_tab_helper_android.cc",
476 "android/tab/thumbnail_tab_helper_android.h",
477 # "android/tab_android.cc",
478 # "android/tab_android.h",
479 "android/tab_state.cc",
480 "android/tab_state.h",
481 "android/thumbnail/thumbnail.cc",
482 "android/thumbnail/thumbnail.h",
483 "android/thumbnail/thumbnail_cache.cc",
484 "android/thumbnail/thumbnail_cache.h",
485 # "android/url_utilities.cc",
486 # "android/url_utilities.h",
487 "android/voice_search_tab_helper.cc",
488 "android/voice_search_tab_helper.h",
489 "android/warmup_manager.cc",
490 "android/warmup_manager.h",
491 "android/web_contents_factory.cc",
492 "android/web_contents_factory.h",
493 "android/webapps/single_tab_mode_tab_helper.cc",
494 "android/webapps/single_tab_mode_tab_helper.h",
495
496 "platform_util_android.cc",
497 ]
498
499 deps += [ "//ui/platform_window/android", ]
500
501 # chrome_browser_sync_sources
502 sources -= [
503 "sync/glue/synced_tab_delegate_android.cc",
504 "sync/glue/synced_tab_delegate_android.h",
505 "sync/glue/synced_window_delegate.h",
506 "sync/glue/synced_window_delegate_android.cc",
507 "sync/glue/synced_window_delegate_android.h",
508 ]
509
510 # chrome_browser_session_sources
511 sources -= [ "sessions/session_restore_android.cc", ]
512
513 sources +=
514 rebase_path(gypi_values.chrome_browser_linux_sources, ".", "//chrome")
515
516 sources += [
517 "../../ui/aura/test/test_focus_client.cc",
518 "../../ui/aura/test/test_focus_client.h",
519 "../../ui/wm/android/android_focus_rules.cc",
520 "../../ui/wm/android/android_focus_rules.h",
521 "../../ui/wm/test/wm_test_helper.cc",
522 "../../ui/wm/test/wm_test_helper.h",
523 ]
524 }
247 525
248 deps += [ 526 deps += [
249 "//apps", 527 "//apps",
250 "//cc", 528 "//cc",
251 "//chrome/app:generated_resources_map", 529 "//chrome/app:generated_resources_map",
252 "//chrome/app/theme:theme_resources", 530 "//chrome/app/theme:theme_resources",
253 "//chrome/browser/devtools", 531 "//chrome/browser/devtools",
254 "//chrome/browser/resources:component_extension_resources", 532 "//chrome/browser/resources:component_extension_resources",
255 "//chrome/installer/util", 533 "//chrome/installer/util",
256 "//components/app_modal", 534 "//components/app_modal",
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 sources += rebase_path( 689 sources += rebase_path(
412 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sou rces, 690 gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sou rces,
413 ".", 691 ".",
414 "//chrome") 692 "//chrome")
415 } 693 }
416 if (is_win || is_mac || is_desktop_linux) { 694 if (is_win || is_mac || is_desktop_linux) {
417 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources, 695 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
418 ".", 696 ".",
419 "//chrome") 697 "//chrome")
420 } 698 }
421 if (is_android || is_ios) { 699 if (is_android && use_aura) {
700 sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
701 ".",
702 "//chrome")
703 }
704 if ((is_android && !use_aura) || is_ios) {
422 sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources, 705 sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
423 ".", 706 ".",
424 "//chrome") 707 "//chrome")
425 } else { 708 } else {
426 deps += [ 709 deps += [
427 "//chrome/browser/policy:path_parser", 710 "//chrome/browser/policy:path_parser",
428 "//net:net_browser_services", 711 "//net:net_browser_services",
429 ] 712 ]
430 } 713 }
431 } else { 714 } else {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 sources += 844 sources +=
562 rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome") 845 rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome")
563 if (is_chromeos) { 846 if (is_chromeos) {
564 sources -= [ "net/nss_context_linux.cc" ] 847 sources -= [ "net/nss_context_linux.cc" ]
565 } 848 }
566 } 849 }
567 if (enable_notifications) { 850 if (enable_notifications) {
568 sources += rebase_path(gypi_values.chrome_browser_notifications_sources, 851 sources += rebase_path(gypi_values.chrome_browser_notifications_sources,
569 ".", 852 ".",
570 "//chrome") 853 "//chrome")
571 if (!is_android) { 854 if (!is_android || use_aura) {
572 sources += rebase_path( 855 sources += rebase_path(
573 gypi_values.chrome_browser_notifications_non_android_sources, 856 gypi_values.chrome_browser_notifications_non_android_sources,
574 ".", 857 ".",
575 "//chrome") 858 "//chrome")
576 } 859 }
860
861 if (is_android && use_aura) {
862 sources -= [
863 "notifications/notification_ui_manager_android.cc",
864 "notifications/notification_ui_manager_android.h",
865 ]
866 }
577 } 867 }
578 if (enable_themes) { 868 if (enable_themes) {
579 sources += 869 sources +=
580 rebase_path(gypi_values.chrome_browser_themes_sources, ".", "//chrome") 870 rebase_path(gypi_values.chrome_browser_themes_sources, ".", "//chrome")
581 } 871 }
582 872
583 if (enable_basic_printing || enable_print_preview) { 873 if (enable_basic_printing || enable_print_preview) {
584 # Some form of printing support. 874 # Some form of printing support.
585 sources += rebase_path(gypi_values.chrome_browser_printing_basic_sources, 875 sources += rebase_path(gypi_values.chrome_browser_printing_basic_sources,
586 ".", 876 ".",
(...skipping 23 matching lines...) Expand all
610 } 900 }
611 if (enable_captive_portal_detection) { 901 if (enable_captive_portal_detection) {
612 sources += rebase_path(gypi_values.chrome_browser_captive_portal_sources, 902 sources += rebase_path(gypi_values.chrome_browser_captive_portal_sources,
613 ".", 903 ".",
614 "//chrome") 904 "//chrome")
615 } 905 }
616 if (enable_session_service) { 906 if (enable_session_service) {
617 sources += rebase_path(gypi_values.chrome_browser_session_service_sources, 907 sources += rebase_path(gypi_values.chrome_browser_session_service_sources,
618 ".", 908 ".",
619 "//chrome") 909 "//chrome")
910 if (is_android && use_aura) {
911 sources -= [
912 "sessions/persistent_tab_restore_service.cc",
913 "sessions/persistent_tab_restore_service.h",
914 ]
915 }
620 } 916 }
621 917
622 if (!is_android && !is_ios && !is_chromeos) { 918 if (!is_android && !is_ios && !is_chromeos) {
623 sources += 919 sources +=
624 rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome") 920 rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
625 } 921 }
626 922
923 if (is_android && use_aura) {
924 sources +=
925 rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
926 }
927
627 if (is_android || is_ios) { 928 if (is_android || is_ios) {
628 # Mobile. 929 # Mobile.
629 sources += 930 sources +=
630 rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome") 931 rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome")
631 } else { 932 } else {
632 # Non-mobile.
633 sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
634 ".",
635 "//chrome")
636 deps += [ 933 deps += [
637 "//components/feedback", 934 # TODO(mfomitchev): not sure if this is needed for Android Aura?
638 "//device/core", 935 "//device/core",
639 "//device/devices_app/public/cpp", 936 "//device/devices_app/public/cpp",
640 "//device/devices_app/public/cpp:factory", 937 "//device/devices_app/public/cpp:factory",
641 "//device/usb", 938 "//device/usb",
642 ] 939 ]
643 } 940 }
941
942 if ((!is_ios && !is_android) || use_aura) {
943 # Non-mobile.
944 sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
945 ".",
946 "//chrome")
644 947
948 if (is_android) {
949 sources -= [
950 "download/download_crx_util.cc",
951 "ssl/ssl_add_certificate.cc",
952 "net/utility_process_mojo_proxy_resolver_factory.cc",
953 "net/utility_process_mojo_proxy_resolver_factory.h",
954 ]
955 }
956
957 deps += [
958 "//components/feedback",
959 ]
960 }
961
645 if (!is_official_build) { 962 if (!is_official_build) {
646 sources += [ 963 sources += [
647 "search/local_files_ntp_source.cc", 964 "search/local_files_ntp_source.cc",
648 "search/local_files_ntp_source.h", 965 "search/local_files_ntp_source.h",
649 ] 966 ]
650 } 967 }
651 968
652 if (is_android) { 969 if (is_android) {
653 sources += 970 sources +=
654 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome") 971 rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome")
(...skipping 20 matching lines...) Expand all
675 "//third_party/libaddressinput", 992 "//third_party/libaddressinput",
676 "//components/storage_monitor", 993 "//components/storage_monitor",
677 "//components/web_modal", 994 "//components/web_modal",
678 ] 995 ]
679 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] 996 defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ]
680 997
681 if (use_seccomp_bpf) { 998 if (use_seccomp_bpf) {
682 defines += [ "USE_SECCOMP_BPF" ] 999 defines += [ "USE_SECCOMP_BPF" ]
683 deps += [ "//sandbox/linux:seccomp_bpf" ] 1000 deps += [ "//sandbox/linux:seccomp_bpf" ]
684 } 1001 }
1002
1003 if (use_aura) {
1004 deps -= [
1005 "//components/web_contents_delegate_android",
1006 "//third_party/libaddressinput:util",
1007 ]
1008 deps += [
1009 "//third_party/libaddressinput",
1010 ]
1011 }
685 } 1012 }
686 1013
687 if (is_mac) { 1014 if (is_mac) {
688 deps += [ 1015 deps += [
689 "//third_party/google_toolbox_for_mac", 1016 "//third_party/google_toolbox_for_mac",
690 "//third_party/mozilla", 1017 "//third_party/mozilla",
691 ] 1018 ]
692 libs += [ 1019 libs += [
693 "Accelerate.framework", 1020 "Accelerate.framework",
694 "AddressBook.framework", 1021 "AddressBook.framework",
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 ".", 1115 ".",
789 "//chrome") 1116 "//chrome")
790 } 1117 }
791 if (enable_app_list) { 1118 if (enable_app_list) {
792 deps += [ "//ui/app_list" ] 1119 deps += [ "//ui/app_list" ]
793 } 1120 }
794 if (enable_supervised_users) { 1121 if (enable_supervised_users) {
795 sources += rebase_path(gypi_values.chrome_browser_supervised_user_sources, 1122 sources += rebase_path(gypi_values.chrome_browser_supervised_user_sources,
796 ".", 1123 ".",
797 "//chrome") 1124 "//chrome")
1125 if (is_android && use_aura) {
1126 sources -= [
1127 "supervised_user/child_accounts/child_account_feedback_reporter_android. cc",
1128 "supervised_user/child_accounts/child_account_feedback_reporter_android. h",
1129 "supervised_user/child_accounts/child_account_service_android.cc",
1130 "supervised_user/child_accounts/child_account_service_android.h",
1131 ]
1132 }
798 } 1133 }
799 if (enable_supervised_users && !is_android && !is_ios) { 1134 if (enable_supervised_users && !is_android && !is_ios) {
800 sources += 1135 sources +=
801 rebase_path(gypi_values.chrome_browser_supervised_user_legacy_sources, 1136 rebase_path(gypi_values.chrome_browser_supervised_user_legacy_sources,
802 ".", 1137 ".",
803 "//chrome") 1138 "//chrome")
804 } 1139 }
805 if (enable_supervised_users && enable_themes) { 1140 if (enable_supervised_users && enable_themes) {
806 sources += rebase_path( 1141 sources += rebase_path(
807 gypi_values.chrome_browser_supervised_user_and_themes_sources, 1142 gypi_values.chrome_browser_supervised_user_and_themes_sources,
808 ".", 1143 ".",
809 "//chrome") 1144 "//chrome")
810 } 1145 }
811 if (enable_webrtc) { 1146 if (enable_webrtc) {
812 sources += 1147 sources +=
813 rebase_path(gypi_values.chrome_browser_webrtc_sources, ".", "//chrome") 1148 rebase_path(gypi_values.chrome_browser_webrtc_sources, ".", "//chrome")
814 } 1149 }
815 if (enable_service_discovery) { 1150 if (enable_service_discovery) {
816 sources += rebase_path(gypi_values.chrome_browser_service_discovery_sources, 1151 sources += rebase_path(gypi_values.chrome_browser_service_discovery_sources,
817 ".", 1152 ".",
818 "//chrome") 1153 "//chrome")
819 } 1154 }
820 if (enable_mdns) { 1155 if (enable_mdns) {
821 sources += 1156 sources +=
822 rebase_path(gypi_values.chrome_browser_mdns_sources, ".", "//chrome") 1157 rebase_path(gypi_values.chrome_browser_mdns_sources, ".", "//chrome")
823 } 1158 }
824 if (!enable_autofill_dialog || is_android || is_ios) { 1159 if (!enable_autofill_dialog || is_android && !use_aura || is_ios) {
825 sources -= [ 1160 sources -= [
826 "autofill/validation_rules_storage_factory.cc", 1161 "autofill/validation_rules_storage_factory.cc",
827 "autofill/validation_rules_storage_factory.h", 1162 "autofill/validation_rules_storage_factory.h",
828 ] 1163 ]
829 } 1164 }
830 if (enable_wifi_bootstrapping) { 1165 if (enable_wifi_bootstrapping) {
831 sources += 1166 sources +=
832 rebase_path(gypi_values.chrome_browser_wifi_bootstrapping_sources, 1167 rebase_path(gypi_values.chrome_browser_wifi_bootstrapping_sources,
833 ".", 1168 ".",
834 "//chrome") 1169 "//chrome")
835 if (is_win || is_mac) { 1170 if (is_win || is_mac) {
836 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows 1171 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows
837 # and Mac, so this test is meaningless. Can we merge these lists? 1172 # and Mac, so this test is meaningless. Can we merge these lists?
838 sources += rebase_path( 1173 sources += rebase_path(
839 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources, 1174 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources,
840 ".", 1175 ".",
841 "//chrome") 1176 "//chrome")
842 } 1177 }
843 } 1178 }
844 if (enable_media_router) { 1179 if (enable_media_router) {
845 deps += [ "//chrome/browser/media/router" ] 1180 deps += [ "//chrome/browser/media/router" ]
846 } 1181 }
847 } 1182 }
848 1183
849 if (is_android) { 1184 if (is_android) {
850 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers 1185 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers
851 generate_jni("jni_headers") { 1186 generate_jni("jni_headers") {
852 sources = 1187 sources =
853 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome") 1188 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
1189 if (use_aura) {
1190 sources -= [ "../android/java/src/org/chromium/chrome/browser/preferences/ LocationSettings.java",
1191 "../android/java/src/org/chromium/chrome/browser/toolbar/Tool barModel.java",
1192 "../android/java/src/org/chromium/chrome/browser/contextualse arch/ContextualSearchManager.java",
1193 "../android/java/src/org/chromium/chrome/browser/ChromeWebCon tentsDelegateAndroid.java",
1194 ]
1195 }
854 jni_package = "chrome" 1196 jni_package = "chrome"
855 } 1197 }
856 1198
857 #GYP: '//chrome/chrome_browser.gypi:client_discourse_context_proto' 1199 #GYP: '//chrome/chrome_browser.gypi:client_discourse_context_proto'
858 proto_library("client_discourse_context_proto") { 1200 proto_library("client_discourse_context_proto") {
859 sources = [ 1201 sources = [
860 "android/proto/client_discourse_context.proto", 1202 "android/proto/client_discourse_context.proto",
861 ] 1203 ]
862 } 1204 }
863 1205
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1560 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1219 deps = [ 1561 deps = [
1220 "//components/google/core/browser", 1562 "//components/google/core/browser",
1221 "//components/omnibox/browser", 1563 "//components/omnibox/browser",
1222 "//components/rlz", 1564 "//components/rlz",
1223 "//components/search_engines", 1565 "//components/search_engines",
1224 "//rlz:rlz_lib", 1566 "//rlz:rlz_lib",
1225 ] 1567 ]
1226 } 1568 }
1227 } 1569 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698