Chromium Code Reviews

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

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//content/child/child.gni") 8 import("//content/child/child.gni")
9 9
10 source_set("child") { 10 source_set("child") {
(...skipping 114 matching lines...)
125 "//third_party/WebKit/public:resources", 125 "//third_party/WebKit/public:resources",
126 "//third_party/npapi", 126 "//third_party/npapi",
127 ] 127 ]
128 } 128 }
129 129
130 if (use_aura && is_mac) { 130 if (use_aura && is_mac) {
131 # This file is already excluded on non-Mac. 131 # This file is already excluded on non-Mac.
132 sources -= [ "npapi/webplugin_delegate_impl_mac.mm" ] 132 sources -= [ "npapi/webplugin_delegate_impl_mac.mm" ]
133 } 133 }
134 134
135 if (is_win || !use_aura) { 135 if (enable_plugins && (is_win || is_android || !use_aura)) {
136 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ] 136 sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
no sievers 2015/10/22 20:55:41 do you need the 'enable_plugins' check? it looks a
mfomitchev 2015/11/02 21:51:16 It was needed because it was already being exclude
137 } 137 }
138 } 138 }
OLDNEW

Powered by Google App Engine