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

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

Issue 1824653002: Remove iOS conditions in content/ build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 9 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 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 13 matching lines...) Expand all
24 ] 24 ]
25 25
26 content_app_deps = [ 26 content_app_deps = [
27 "//base", 27 "//base",
28 "//base:i18n", 28 "//base:i18n",
29 "//content:export", 29 "//content:export",
30 "//content:sandbox_helper_win", 30 "//content:sandbox_helper_win",
31 "//content/public/common:common_sources", 31 "//content/public/common:common_sources",
32 "//content/public/common:mojo_bindings", 32 "//content/public/common:mojo_bindings",
33 "//crypto", 33 "//crypto",
34 "//mojo/shell/public/interfaces",
35 "//mojo/edk/system",
34 "//ui/base", 36 "//ui/base",
35 "//ui/gfx", 37 "//ui/gfx",
36 "//ui/gfx/geometry", 38 "//ui/gfx/geometry",
37 ] 39 ]
38 40
39 if (is_win) { 41 if (is_win) {
40 content_app_deps += [ "//sandbox" ] 42 content_app_deps += [ "//sandbox" ]
41 } else if (is_android) { 43 } else if (is_android) {
42 content_app_sources -= [ "content_main.cc" ] 44 content_app_sources -= [ "content_main.cc" ]
43 content_app_deps += [ 45 content_app_deps += [
44 "//content/public/android:jni", 46 "//content/public/android:jni",
45 "//device/usb", 47 "//device/usb",
46 "//device/vibration", 48 "//device/vibration",
47 "//skia", 49 "//skia",
48 "//third_party/android_tools:cpu_features", 50 "//third_party/android_tools:cpu_features",
49 "//ui/android", 51 "//ui/android",
50 ] 52 ]
51 } 53 }
52 54
53 if (is_ios) {
54 content_app_sources -= [
55 "content_main.cc",
56 "mojo/mojo_init.cc",
57 "mojo/mojo_init.h",
58 ]
59 } else {
60 content_app_deps += [
61 "//mojo/shell/public/interfaces",
62 "//mojo/edk/system",
63 ]
64 }
65
66 content_app_extra_configs = [ 55 content_app_extra_configs = [
67 "//build/config/compiler:wexit_time_destructors", 56 "//build/config/compiler:wexit_time_destructors",
68 "//content:content_implementation", 57 "//content:content_implementation",
69 "//content/public/common:mojo_shell_client", 58 "//content/public/common:mojo_shell_client",
70 "//v8:external_startup_data", 59 "//v8:external_startup_data",
71 ] 60 ]
72 61
73 if (!is_multi_dll_chrome) { 62 if (!is_multi_dll_chrome) {
74 content_app_deps += [ "//content/gpu:gpu_sources" ] 63 content_app_deps += [ "//content/gpu:gpu_sources" ]
75 } 64 }
(...skipping 26 matching lines...) Expand all
102 source_set("child") { 91 source_set("child") {
103 visibility = [ "//content/public/app:child" ] 92 visibility = [ "//content/public/app:child" ]
104 93
105 sources = content_app_sources 94 sources = content_app_sources
106 configs += content_app_extra_configs 95 configs += content_app_extra_configs
107 deps = content_app_deps 96 deps = content_app_deps
108 97
109 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] 98 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
110 } 99 }
111 } 100 }
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