Chromium Code Reviews| 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("//content/browser/browser.gni") | 8 import("//content/browser/browser.gni") |
| 9 import("//media/media_options.gni") | 9 import("//media/media_options.gni") |
| 10 | 10 |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 337 sources += rebase_path(content_browser_gypi_values.android_browser_sources, | 337 sources += rebase_path(content_browser_gypi_values.android_browser_sources, |
| 338 ".", | 338 ".", |
| 339 "//content") | 339 "//content") |
| 340 sources -= [ | 340 sources -= [ |
| 341 "browser_ipc_logging.cc", | 341 "browser_ipc_logging.cc", |
| 342 "device_sensors/data_fetcher_shared_memory_default.cc", | 342 "device_sensors/data_fetcher_shared_memory_default.cc", |
| 343 "geolocation/network_location_provider.cc", | 343 "geolocation/network_location_provider.cc", |
| 344 "geolocation/network_location_provider.h", | 344 "geolocation/network_location_provider.h", |
| 345 "geolocation/network_location_request.cc", | 345 "geolocation/network_location_request.cc", |
| 346 "geolocation/network_location_request.h", | 346 "geolocation/network_location_request.h", |
| 347 "renderer_host/begin_frame_observer_proxy.cc", | 347 # "renderer_host/begin_frame_observer_proxy.cc", |
| 348 "tracing/tracing_ui.cc", | 348 "tracing/tracing_ui.cc", |
| 349 "tracing/tracing_ui.h", | 349 "tracing/tracing_ui.h", |
| 350 | 350 |
| 351 # Android skips most, but not all, of the speech code. | 351 # Android skips most, but not all, of the speech code. |
| 352 "speech/audio_buffer.cc", | 352 "speech/audio_buffer.cc", |
| 353 "speech/audio_buffer.h", | 353 "speech/audio_buffer.h", |
| 354 "speech/audio_encoder.cc", | 354 "speech/audio_encoder.cc", |
| 355 "speech/audio_encoder.h", | 355 "speech/audio_encoder.h", |
| 356 "speech/chunked_byte_buffer.cc", | 356 "speech/chunked_byte_buffer.cc", |
| 357 "speech/chunked_byte_buffer.h", | 357 "speech/chunked_byte_buffer.h", |
| 358 "speech/endpointer/endpointer.cc", | 358 "speech/endpointer/endpointer.cc", |
| 359 "speech/endpointer/endpointer.h", | 359 "speech/endpointer/endpointer.h", |
| 360 "speech/endpointer/energy_endpointer.cc", | 360 "speech/endpointer/energy_endpointer.cc", |
| 361 "speech/endpointer/energy_endpointer.h", | 361 "speech/endpointer/energy_endpointer.h", |
| 362 "speech/endpointer/energy_endpointer_params.cc", | 362 "speech/endpointer/energy_endpointer_params.cc", |
| 363 "speech/endpointer/energy_endpointer_params.h", | 363 "speech/endpointer/energy_endpointer_params.h", |
| 364 "speech/google_one_shot_remote_engine.cc", | 364 "speech/google_one_shot_remote_engine.cc", |
| 365 "speech/google_one_shot_remote_engine.h", | 365 "speech/google_one_shot_remote_engine.h", |
| 366 "speech/google_streaming_remote_engine.cc", | 366 "speech/google_streaming_remote_engine.cc", |
| 367 "speech/google_streaming_remote_engine.h", | 367 "speech/google_streaming_remote_engine.h", |
| 368 "speech/speech_recognition_engine.cc", | 368 "speech/speech_recognition_engine.cc", |
| 369 "speech/speech_recognition_engine.h", | 369 "speech/speech_recognition_engine.h", |
| 370 "speech/speech_recognizer_impl.cc", | 370 "speech/speech_recognizer_impl.cc", |
| 371 "speech/speech_recognizer_impl.h", | 371 "speech/speech_recognizer_impl.h", |
| 372 ] | 372 ] |
| 373 | |
| 374 if (!use_aura) { | |
| 375 sources -= [ | |
| 376 "renderer_host/begin_frame_observer_proxy.cc", | |
|
no sievers
2015/10/20 19:24:22
let's consider moving this to 'compositor_browser_
| |
| 377 ] | |
| 378 } | |
| 379 | |
| 373 deps += [ | 380 deps += [ |
| 374 "//content/public/android:jni", | 381 "//content/public/android:jni", |
| 375 "//media", | 382 "//media", |
| 376 "//mojo/android:libsystem_java", | 383 "//mojo/android:libsystem_java", |
| 377 "//ui/android", | 384 "//ui/android", |
| 378 ] | 385 ] |
| 379 libs += [ "jnigraphics" ] | 386 libs += [ "jnigraphics" ] |
| 380 } | 387 } |
| 381 | 388 |
| 382 if (is_mac) { | 389 if (is_mac) { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 405 ] | 412 ] |
| 406 } | 413 } |
| 407 | 414 |
| 408 if (use_aura) { | 415 if (use_aura) { |
| 409 deps += [ | 416 deps += [ |
| 410 "//ui/aura", | 417 "//ui/aura", |
| 411 "//ui/aura_extra", | 418 "//ui/aura_extra", |
| 412 "//ui/strings", | 419 "//ui/strings", |
| 413 "//ui/wm", | 420 "//ui/wm", |
| 414 ] | 421 ] |
| 422 | |
| 423 if (is_android) { | |
| 424 sources-= [ | |
| 425 "accessibility/accessibility_tree_formatter_android.cc", | |
| 426 "accessibility/browser_accessibility_android.cc", | |
| 427 "accessibility/browser_accessibility_android.h", | |
| 428 "accessibility/browser_accessibility_manager_android.cc", | |
| 429 "accessibility/browser_accessibility_manager_android.h", | |
|
no sievers
2015/10/20 19:24:21
let's pull out all accessibility-related changes i
| |
| 430 | |
| 431 "android/animation_utils.h", | |
|
no sievers
2015/10/20 19:24:21
android/animation_utils.h and touch handle and edg
| |
| 432 "android/background_sync_launcher_android.cc", | |
| 433 "android/background_sync_launcher_android.h", | |
|
no sievers
2015/10/20 19:24:22
to-be-decoupled
| |
| 434 # "android/browser_jni_registrar.cc", | |
| 435 # "android/browser_jni_registrar.h", | |
| 436 # "android/browser_startup_controller.cc", | |
| 437 # "android/browser_startup_controller.h", | |
| 438 "android/browser_surface_texture_manager.cc", | |
| 439 "android/browser_surface_texture_manager.h", | |
|
no sievers
2015/10/20 19:24:22
try to keep this in
| |
| 440 | |
| 441 # "android/child_process_launcher_android.cc", | |
| 442 # "android/child_process_launcher_android.h", | |
| 443 | |
| 444 "android/composited_touch_handle_drawable.cc", | |
| 445 "android/composited_touch_handle_drawable.h", | |
| 446 "android/content_protocol_handler_impl.cc", | |
| 447 "android/content_protocol_handler_impl.h", | |
|
no sievers
2015/10/20 19:24:22
need to keep content_protocol_handler for file req
| |
| 448 "android/content_readback_handler.cc", | |
| 449 "android/content_readback_handler.h", | |
| 450 # "android/content_startup_flags.cc", | |
|
no sievers
2015/10/20 19:24:22
should keep content_startup_flags.cc
| |
| 451 # "android/content_startup_flags.h", | |
| 452 "android/content_video_view.cc", | |
| 453 "android/content_video_view.h", | |
| 454 "android/content_view_core_impl.cc", | |
| 455 "android/content_view_core_impl.h", | |
| 456 "android/content_view_render_view.cc", | |
| 457 "android/content_view_render_view.h", | |
| 458 "android/content_view_statics.cc", | |
| 459 "android/content_view_statics.h", | |
| 460 "android/date_time_chooser_android.cc", | |
| 461 "android/date_time_chooser_android.h", | |
| 462 "android/deferred_download_observer.cc", | |
| 463 "android/deferred_download_observer.h", | |
| 464 # "android/devtools_auth.cc", | |
| 465 "android/download_controller_android_impl.cc", | |
| 466 "android/download_controller_android_impl.h", | |
| 467 "android/edge_effect.cc", | |
| 468 "android/edge_effect.h", | |
| 469 "android/edge_effect_l.cc", | |
| 470 "android/edge_effect_l.h", | |
| 471 "android/in_process/context_provider_in_process.cc", | |
| 472 "android/in_process/context_provider_in_process.h", | |
| 473 "android/in_process/synchronous_compositor_external_begin_frame_source.c c", | |
| 474 "android/in_process/synchronous_compositor_external_begin_frame_source.h ", | |
| 475 "android/in_process/synchronous_compositor_factory_impl.cc", | |
| 476 "android/in_process/synchronous_compositor_factory_impl.h", | |
| 477 "android/in_process/synchronous_compositor_impl.cc", | |
| 478 "android/in_process/synchronous_compositor_impl.h", | |
| 479 "android/in_process/synchronous_compositor_output_surface.cc", | |
| 480 "android/in_process/synchronous_compositor_output_surface.h", | |
| 481 "android/in_process/synchronous_compositor_registry.cc", | |
| 482 "android/in_process/synchronous_compositor_registry.h", | |
| 483 "android/in_process/synchronous_input_event_filter.cc", | |
| 484 "android/in_process/synchronous_input_event_filter.h", | |
| 485 "android/in_process_surface_texture_manager.cc", | |
| 486 "android/in_process_surface_texture_manager.h", | |
|
no sievers
2015/10/20 19:24:21
keep in_process_surface_texture_manager
| |
| 487 "android/interstitial_page_delegate_android.cc", | |
| 488 "android/interstitial_page_delegate_android.h", | |
| 489 "android/load_url_params.cc", | |
| 490 "android/load_url_params.h", | |
| 491 "android/media_players_observer.cc", | |
| 492 "android/media_players_observer.h", | |
|
no sievers
2015/10/20 19:24:22
this is gone, but keep all media_player stuff
| |
| 493 "android/overscroll_controller_android.cc", | |
| 494 "android/overscroll_controller_android.h", | |
| 495 "android/overscroll_glow.cc", | |
| 496 "android/overscroll_glow.h", | |
| 497 "android/overscroll_refresh.cc", | |
| 498 "android/overscroll_refresh.h", | |
| 499 "android/popup_touch_handle_drawable.cc", | |
| 500 "android/popup_touch_handle_drawable.h", | |
| 501 "android/tracing_controller_android.cc", | |
| 502 "android/tracing_controller_android.h", | |
|
no sievers
2015/10/20 19:24:22
keep tracing_controller
| |
| 503 "android/url_request_content_job.cc", | |
| 504 "android/url_request_content_job.h", | |
|
no sievers
2015/10/20 19:24:22
keep url_request_content_job
| |
| 505 "android/web_contents_observer_proxy.cc", | |
| 506 "android/web_contents_observer_proxy.h", | |
| 507 | |
| 508 "media/android/browser_media_player_manager.h", | |
| 509 "media/android/browser_media_player_manager.cc", | |
| 510 "media/android/media_session.h", | |
| 511 "media/android/media_session.cc", | |
|
no sievers
2015/10/20 19:24:22
keep these
| |
| 512 | |
| 513 "renderer_host/compositor_impl_android.cc", | |
| 514 "renderer_host/ime_adapter_android.cc", | |
| 515 "renderer_host/ime_adapter_android.h", | |
| 516 "renderer_host/input/synthetic_gesture_target_android.h", | |
| 517 "renderer_host/input/synthetic_gesture_target_android.cc", | |
| 518 "renderer_host/native_web_keyboard_event_android.cc", | |
| 519 "renderer_host/render_widget_host_view_android.cc", | |
| 520 "renderer_host/render_widget_host_view_android.h", | |
| 521 "screen_orientation/screen_orientation_delegate_android.cc", | |
| 522 "screen_orientation/screen_orientation_delegate_android.h", | |
| 523 "screen_orientation/screen_orientation_message_filter_android.cc", | |
| 524 "screen_orientation/screen_orientation_message_filter_android.h", | |
|
no sievers
2015/10/20 19:24:22
this we should also try to keep (for screen orient
| |
| 525 "web_contents/web_contents_android.cc", | |
| 526 "web_contents/web_contents_android.h", | |
| 527 "web_contents/web_contents_view_android.cc", | |
| 528 "web_contents/web_contents_view_android.h", | |
| 529 "power_save_blocker_android.cc", | |
|
no sievers
2015/10/20 19:24:21
let's file a bug for implementing power save block
| |
| 530 ] | |
| 531 } | |
| 415 } else { # Not aura. | 532 } else { # Not aura. |
| 416 sources -= [ | 533 sources -= [ |
| 417 "renderer_host/compositor_resize_lock_aura.cc", | 534 "renderer_host/compositor_resize_lock_aura.cc", |
| 418 "renderer_host/compositor_resize_lock_aura.h", | 535 "renderer_host/compositor_resize_lock_aura.h", |
| 419 "renderer_host/input/synthetic_gesture_target_aura.cc", | 536 "renderer_host/input/synthetic_gesture_target_aura.cc", |
| 420 "renderer_host/input/synthetic_gesture_target_aura.h", | 537 "renderer_host/input/synthetic_gesture_target_aura.h", |
| 421 "renderer_host/input/touch_selection_controller_client_aura.cc", | 538 "renderer_host/input/touch_selection_controller_client_aura.cc", |
| 422 "renderer_host/input/touch_selection_controller_client_aura.h", | 539 "renderer_host/input/touch_selection_controller_client_aura.h", |
| 423 "renderer_host/native_web_keyboard_event_aura.cc", | 540 "renderer_host/native_web_keyboard_event_aura.cc", |
| 424 "renderer_host/render_widget_host_view_aura.cc", | 541 "renderer_host/render_widget_host_view_aura.cc", |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 500 if (enable_webvr) { | 617 if (enable_webvr) { |
| 501 sources += [ | 618 sources += [ |
| 502 "vr/vr_device.cc", | 619 "vr/vr_device.cc", |
| 503 "vr/vr_device.h", | 620 "vr/vr_device.h", |
| 504 "vr/vr_device_manager.cc", | 621 "vr/vr_device_manager.cc", |
| 505 "vr/vr_device_manager.h", | 622 "vr/vr_device_manager.h", |
| 506 "vr/vr_device_provider.h", | 623 "vr/vr_device_provider.h", |
| 507 ] | 624 ] |
| 508 } | 625 } |
| 509 } | 626 } |
| OLD | NEW |