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

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

Issue 1646693002: Revert of Aura on Android: Remove unnecessary dependencies on ui/android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 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
« no previous file with comments | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/browser/browser.gni") 7 import("//content/browser/browser.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 9
10 source_set("browser") { 10 source_set("browser") {
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 if (!use_aura) { 376 if (!use_aura) {
377 sources += rebase_path( 377 sources += rebase_path(
378 content_browser_gypi_values.android_non_aura_browser_sources, 378 content_browser_gypi_values.android_non_aura_browser_sources,
379 ".", 379 ".",
380 "//content") 380 "//content")
381 sources += rebase_path( 381 sources += rebase_path(
382 content_browser_gypi_values.android_in_process_browser_sources, 382 content_browser_gypi_values.android_in_process_browser_sources,
383 ".", 383 ".",
384 "//content") 384 "//content")
385 sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ] 385 sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
386 deps += [ "//ui/android" ]
387 } 386 }
388 387
389 deps -= [ "//device/battery" ] 388 deps -= [ "//device/battery" ]
390 deps += [ 389 deps += [
391 "//content/public/android:jni", 390 "//content/public/android:jni",
392 "//media", 391 "//media",
393 "//media/mojo/interfaces", 392 "//media/mojo/interfaces",
394 "//mojo/android:libsystem_java", 393 "//mojo/android:libsystem_java",
394 "//ui/android",
395 ] 395 ]
396 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ] 396 defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
397 libs += [ "jnigraphics" ] 397 libs += [ "jnigraphics" ]
398 } 398 }
399 399
400 if (is_mac) { 400 if (is_mac) {
401 sources -= [ 401 sources -= [
402 "device_sensors/data_fetcher_shared_memory_default.cc", 402 "device_sensors/data_fetcher_shared_memory_default.cc",
403 "geolocation/empty_wifi_data_provider.cc", 403 "geolocation/empty_wifi_data_provider.cc",
404 "geolocation/empty_wifi_data_provider.h", 404 "geolocation/empty_wifi_data_provider.h",
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 552
553 if (enable_webvr && is_android) { 553 if (enable_webvr && is_android) {
554 sources += [ 554 sources += [
555 "vr/android/cardboard/cardboard_vr_device.cc", 555 "vr/android/cardboard/cardboard_vr_device.cc",
556 "vr/android/cardboard/cardboard_vr_device.h", 556 "vr/android/cardboard/cardboard_vr_device.h",
557 "vr/android/cardboard/cardboard_vr_device_provider.cc", 557 "vr/android/cardboard/cardboard_vr_device_provider.cc",
558 "vr/android/cardboard/cardboard_vr_device_provider.h", 558 "vr/android/cardboard/cardboard_vr_device_provider.h",
559 ] 559 ]
560 } 560 }
561 } 561 }
OLDNEW
« no previous file with comments | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698