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

Side by Side Diff: content/app/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 | « no previous file | content/browser/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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/ui.gni")
7 6
8 content_app_sources = [ 7 content_app_sources = [
9 "android/app_jni_registrar.cc", 8 "android/app_jni_registrar.cc",
10 "android/app_jni_registrar.h", 9 "android/app_jni_registrar.h",
11 "android/child_process_service.cc", 10 "android/child_process_service.cc",
12 "android/child_process_service.h", 11 "android/child_process_service.h",
13 "android/content_jni_onload.cc", 12 "android/content_jni_onload.cc",
14 "android/content_main.cc", 13 "android/content_main.cc",
15 "android/content_main.h", 14 "android/content_main.h",
16 "android/library_loader_hooks.cc", 15 "android/library_loader_hooks.cc",
(...skipping 26 matching lines...) Expand all
43 42
44 if (is_win) { 43 if (is_win) {
45 content_app_deps += [ "//sandbox" ] 44 content_app_deps += [ "//sandbox" ]
46 } else if (is_android) { 45 } else if (is_android) {
47 content_app_sources -= [ "content_main.cc" ] 46 content_app_sources -= [ "content_main.cc" ]
48 content_app_deps += [ 47 content_app_deps += [
49 "//content/public/android:jni", 48 "//content/public/android:jni",
50 "//device/vibration", 49 "//device/vibration",
51 "//skia", 50 "//skia",
52 "//third_party/android_tools:cpu_features", 51 "//third_party/android_tools:cpu_features",
52 "//ui/android",
53 ] 53 ]
54 if (!use_aura) {
55 content_app_deps += [ "//ui/android" ]
56 }
57 } 54 }
58 55
59 if (is_ios) { 56 if (is_ios) {
60 content_app_sources -= [ 57 content_app_sources -= [
61 "content_main.cc", 58 "content_main.cc",
62 "mojo/mojo_init.cc", 59 "mojo/mojo_init.cc",
63 "mojo/mojo_init.h", 60 "mojo/mojo_init.h",
64 ] 61 ]
65 } else { 62 } else {
66 content_app_deps += [ 63 content_app_deps += [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 source_set("child") { 106 source_set("child") {
110 visibility = [ "//content/public/app:child" ] 107 visibility = [ "//content/public/app:child" ]
111 108
112 sources = content_app_sources 109 sources = content_app_sources
113 configs += content_app_extra_configs 110 configs += content_app_extra_configs
114 deps = content_app_deps 111 deps = content_app_deps
115 112
116 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] 113 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
117 } 114 }
118 } 115 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698