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

Unified 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, 11 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/BUILD.gn
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 86e154d319c6ef47efe77090376eb543682ca30a..eb1f7d0cad478ff095b67b6c923417fe04c843c1 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -59,10 +59,6 @@ source_set("child") {
if (enable_plugins) {
deps += [ "//ppapi/proxy" ]
-
- if (is_win || is_android || !use_aura) {
- sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
- }
} else {
sources -= [
"browser_font_resource_trusted.cc",
@@ -96,7 +92,9 @@ source_set("child") {
} else if (is_android) {
sources -= [ "npapi/webplugin_delegate_impl_android.cc" ]
}
- sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
+ if (use_aura) {
+ sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
+ }
}
configs += [
@@ -126,4 +124,8 @@ source_set("child") {
# This file is already excluded on non-Mac.
sources -= [ "npapi/webplugin_delegate_impl_mac.mm" ]
}
+
+ if (is_win || !use_aura) {
+ sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
+ }
}
« 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