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

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

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… 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/browser/web_contents/web_contents_impl.cc ('k') | content/content_browser.gypi » ('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/child/child.gni") 7 import("//content/child/child.gni")
8 8
9 source_set("child") { 9 source_set("child") {
10 # Only the public target should depend on this. All other targets (even 10 # Only the public target should depend on this. All other targets (even
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 "webthemeengine_impl_default.h", 52 "webthemeengine_impl_default.h",
53 ] 53 ]
54 } 54 }
55 55
56 if (is_android) { 56 if (is_android) {
57 deps += [ "//third_party/android_tools:cpu_features" ] 57 deps += [ "//third_party/android_tools:cpu_features" ]
58 } 58 }
59 59
60 if (enable_plugins) { 60 if (enable_plugins) {
61 deps += [ "//ppapi/proxy" ] 61 deps += [ "//ppapi/proxy" ]
62
63 if (is_win || is_android || !use_aura) {
64 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
65 }
66 } else { 62 } else {
67 sources -= [ 63 sources -= [
68 "browser_font_resource_trusted.cc", 64 "browser_font_resource_trusted.cc",
69 "npapi/plugin_host.cc", 65 "npapi/plugin_host.cc",
70 "npapi/plugin_host.h", 66 "npapi/plugin_host.h",
71 "npapi/plugin_instance.cc", 67 "npapi/plugin_instance.cc",
72 "npapi/plugin_instance.h", 68 "npapi/plugin_instance.h",
73 "npapi/plugin_lib.cc", 69 "npapi/plugin_lib.cc",
74 "npapi/plugin_lib.h", 70 "npapi/plugin_lib.h",
75 "npapi/webplugin.h", 71 "npapi/webplugin.h",
(...skipping 13 matching lines...) Expand all
89 ] 85 ]
90 } else if (is_win) { 86 } else if (is_win) {
91 sources -= [ 87 sources -= [
92 "npapi/webplugin_delegate_impl_win.cc", 88 "npapi/webplugin_delegate_impl_win.cc",
93 "npapi/webplugin_ime_win.cc", 89 "npapi/webplugin_ime_win.cc",
94 "npapi/webplugin_ime_win.h", 90 "npapi/webplugin_ime_win.h",
95 ] 91 ]
96 } else if (is_android) { 92 } else if (is_android) {
97 sources -= [ "npapi/webplugin_delegate_impl_android.cc" ] 93 sources -= [ "npapi/webplugin_delegate_impl_android.cc" ]
98 } 94 }
99 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ] 95 if (use_aura) {
96 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
97 }
100 } 98 }
101 99
102 configs += [ 100 configs += [
103 "//content:content_implementation", 101 "//content:content_implementation",
104 "//build/config/compiler:no_size_t_to_int_warning", 102 "//build/config/compiler:no_size_t_to_int_warning",
105 ] 103 ]
106 104
107 if (is_ios) { 105 if (is_ios) {
108 # iOS only needs a small portion of content; exclude all the 106 # iOS only needs a small portion of content; exclude all the
109 # implementation, and re-include what is used. 107 # implementation, and re-include what is used.
110 sources = [] 108 sources = []
111 } else { 109 } else {
112 deps += [ 110 deps += [
113 "//components/scheduler:scheduler", 111 "//components/scheduler:scheduler",
114 "//content/app/resources", 112 "//content/app/resources",
115 "//content/app/strings", 113 "//content/app/strings",
116 "//crypto:platform", 114 "//crypto:platform",
117 "//storage/common", 115 "//storage/common",
118 "//third_party/WebKit/public:blink", 116 "//third_party/WebKit/public:blink",
119 "//third_party/WebKit/public:image_resources", 117 "//third_party/WebKit/public:image_resources",
120 "//third_party/WebKit/public:resources", 118 "//third_party/WebKit/public:resources",
121 "//third_party/npapi", 119 "//third_party/npapi",
122 ] 120 ]
123 } 121 }
124 122
125 if (use_aura && is_mac) { 123 if (use_aura && is_mac) {
126 # This file is already excluded on non-Mac. 124 # This file is already excluded on non-Mac.
127 sources -= [ "npapi/webplugin_delegate_impl_mac.mm" ] 125 sources -= [ "npapi/webplugin_delegate_impl_mac.mm" ]
128 } 126 }
127
128 if (is_win || !use_aura) {
129 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
130 }
129 } 131 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698