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

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

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Addressing final comments, Mac GN build fix. Created 5 years, 1 month 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/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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 } 321 }
322 322
323 if (use_pango) { 323 if (use_pango) {
324 configs += [ "//build/config/linux:pangocairo" ] 324 configs += [ "//build/config/linux:pangocairo" ]
325 } 325 }
326 326
327 if (is_android) { 327 if (is_android) {
328 sources += rebase_path(content_browser_gypi_values.android_browser_sources, 328 sources += rebase_path(content_browser_gypi_values.android_browser_sources,
329 ".", 329 ".",
330 "//content") 330 "//content")
331 sources += rebase_path(
332 content_browser_gypi_values.android_in_process_browser_sources,
333 ".",
334 "//content")
335 sources -= [ 331 sources -= [
336 "browser_ipc_logging.cc", 332 "browser_ipc_logging.cc",
337 "device_sensors/data_fetcher_shared_memory_default.cc", 333 "device_sensors/data_fetcher_shared_memory_default.cc",
338 "geolocation/network_location_provider.cc", 334 "geolocation/network_location_provider.cc",
339 "geolocation/network_location_provider.h", 335 "geolocation/network_location_provider.h",
340 "geolocation/network_location_request.cc", 336 "geolocation/network_location_request.cc",
341 "geolocation/network_location_request.h", 337 "geolocation/network_location_request.h",
342 "power_usage_monitor_impl.cc", 338 "power_usage_monitor_impl.cc",
343 "power_usage_monitor_impl.h", 339 "power_usage_monitor_impl.h",
344 "renderer_host/begin_frame_observer_proxy.cc",
345 "tracing/tracing_ui.cc", 340 "tracing/tracing_ui.cc",
346 "tracing/tracing_ui.h", 341 "tracing/tracing_ui.h",
347 342
348 # Android skips most, but not all, of the speech code. 343 # Android skips most, but not all, of the speech code.
349 "speech/audio_buffer.cc", 344 "speech/audio_buffer.cc",
350 "speech/audio_buffer.h", 345 "speech/audio_buffer.h",
351 "speech/audio_encoder.cc", 346 "speech/audio_encoder.cc",
352 "speech/audio_encoder.h", 347 "speech/audio_encoder.h",
353 "speech/chunked_byte_buffer.cc", 348 "speech/chunked_byte_buffer.cc",
354 "speech/chunked_byte_buffer.h", 349 "speech/chunked_byte_buffer.h",
355 "speech/endpointer/endpointer.cc", 350 "speech/endpointer/endpointer.cc",
356 "speech/endpointer/endpointer.h", 351 "speech/endpointer/endpointer.h",
357 "speech/endpointer/energy_endpointer.cc", 352 "speech/endpointer/energy_endpointer.cc",
358 "speech/endpointer/energy_endpointer.h", 353 "speech/endpointer/energy_endpointer.h",
359 "speech/endpointer/energy_endpointer_params.cc", 354 "speech/endpointer/energy_endpointer_params.cc",
360 "speech/endpointer/energy_endpointer_params.h", 355 "speech/endpointer/energy_endpointer_params.h",
361 "speech/google_one_shot_remote_engine.cc", 356 "speech/google_one_shot_remote_engine.cc",
362 "speech/google_one_shot_remote_engine.h", 357 "speech/google_one_shot_remote_engine.h",
363 "speech/google_streaming_remote_engine.cc", 358 "speech/google_streaming_remote_engine.cc",
364 "speech/google_streaming_remote_engine.h", 359 "speech/google_streaming_remote_engine.h",
365 "speech/speech_recognition_engine.cc", 360 "speech/speech_recognition_engine.cc",
366 "speech/speech_recognition_engine.h", 361 "speech/speech_recognition_engine.h",
367 "speech/speech_recognizer_impl.cc", 362 "speech/speech_recognizer_impl.cc",
368 "speech/speech_recognizer_impl.h", 363 "speech/speech_recognizer_impl.h",
369 ] 364 ]
365
366 if (!use_aura) {
367 sources += rebase_path(
368 content_browser_gypi_values.android_non_aura_browser_sources,
369 ".",
370 "//content")
371 sources += rebase_path(
372 content_browser_gypi_values.android_in_process_browser_sources,
373 ".",
374 "//content")
375 sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
376 }
377
370 deps -= [ "//device/battery" ] 378 deps -= [ "//device/battery" ]
371 deps += [ 379 deps += [
372 "//content/public/android:jni", 380 "//content/public/android:jni",
373 "//media", 381 "//media",
374 "//mojo/android:libsystem_java", 382 "//mojo/android:libsystem_java",
375 "//ui/android", 383 "//ui/android",
376 ] 384 ]
377 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ] 385 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
378 libs += [ "jnigraphics" ] 386 libs += [ "jnigraphics" ]
379 } 387 }
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 520
513 if (enable_webvr && is_android) { 521 if (enable_webvr && is_android) {
514 sources += [ 522 sources += [
515 "vr/android/cardboard/cardboard_vr_device.cc", 523 "vr/android/cardboard/cardboard_vr_device.cc",
516 "vr/android/cardboard/cardboard_vr_device.h", 524 "vr/android/cardboard/cardboard_vr_device.h",
517 "vr/android/cardboard/cardboard_vr_device_provider.cc", 525 "vr/android/cardboard/cardboard_vr_device_provider.cc",
518 "vr/android/cardboard/cardboard_vr_device_provider.h", 526 "vr/android/cardboard/cardboard_vr_device_provider.h",
519 ] 527 ]
520 } 528 }
521 } 529 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698