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

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

Issue 1460633005: Aura on Android: Remove unnecessary dependencies on ui/android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/app/BUILD.gn on Android when use_aura is not defined explicitly. 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
« 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 6
7 content_app_sources = [ 7 content_app_sources = [
8 "android/app_jni_registrar.cc", 8 "android/app_jni_registrar.cc",
9 "android/app_jni_registrar.h", 9 "android/app_jni_registrar.h",
10 "android/child_process_service.cc", 10 "android/child_process_service.cc",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 if (is_win) { 43 if (is_win) {
44 content_app_deps += [ "//sandbox" ] 44 content_app_deps += [ "//sandbox" ]
45 } else if (is_android) { 45 } else if (is_android) {
46 content_app_sources -= [ "content_main.cc" ] 46 content_app_sources -= [ "content_main.cc" ]
47 content_app_deps += [ 47 content_app_deps += [
48 "//content/public/android:jni", 48 "//content/public/android:jni",
49 "//device/vibration", 49 "//device/vibration",
50 "//skia", 50 "//skia",
51 "//third_party/android_tools:cpu_features", 51 "//third_party/android_tools:cpu_features",
52 "//ui/android",
53 ] 52 ]
53 if (!defined(use_aura) || !use_aura) {
Hadi 2015/11/20 15:42:42 mfomitchev@/sievers@ do you know from top of your
mfomitchev 2015/11/20 15:55:03 I think you need to add 'import("//build/config/ui
Hadi 2015/11/20 16:04:48 Done.
54 content_app_deps += [ "//ui/android" ]
55 }
54 } 56 }
55 57
56 if (is_ios) { 58 if (is_ios) {
57 content_app_sources -= [ 59 content_app_sources -= [
58 "content_main.cc", 60 "content_main.cc",
59 "mojo/mojo_init.cc", 61 "mojo/mojo_init.cc",
60 "mojo/mojo_init.h", 62 "mojo/mojo_init.h",
61 ] 63 ]
62 } else { 64 } else {
63 content_app_deps += [ 65 content_app_deps += [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 source_set("child") { 107 source_set("child") {
106 visibility = [ "//content/public/app:child" ] 108 visibility = [ "//content/public/app:child" ]
107 109
108 sources = content_app_sources 110 sources = content_app_sources
109 configs += content_app_extra_configs 111 configs += content_app_extra_configs
110 deps = content_app_deps 112 deps = content_app_deps
111 113
112 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] 114 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
113 } 115 }
114 } 116 }
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