Aura on Android: content/browser

content/child/BUILD.gn

Index: content/child/BUILD.gn
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 0d13f5d99ff675e20aa04ab3a76dc9e88ba27a48..ab330ade982b9f3398eaba1dc73c11ed862f6537 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -56,6 +56,10 @@ source_set("child") {
 
   if (enable_plugins) {
     deps += [ "//ppapi/proxy" ]
+
+    if (is_win || is_android) {
+      sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
+    }
   } else {
     sources -= [
       "browser_font_resource_trusted.cc",
@@ -99,9 +103,7 @@ source_set("child") {
     } else if (is_android) {
       sources -= [ "npapi/webplugin_delegate_impl_android.cc" ]
     }
-    if (use_aura) {
-      sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]
-    }
+    sources -= [ "npapi/webplugin_delegate_impl_aura.cc" ]

[no sievers, 2015/11/02 22:27:15]

nit: you should be able to keep the 'if (use_aura)' check for consistency with
how we remove only sources that are in the list (is_win would not only imply
use_aura, but it also wouldn't have been added).

[mfomitchev, 2015/11/02 22:56:32]

If we try to remove something that wasn't added, that will result in a build
error, so we definitely need to handle this. That said, the filename build rules
for GN do not have any special treatment for _aura suffixes (unlike the rules
for GYP), so we do need to remove this on non-Aura platforms too. Note that
before my change this was done in line 136.

   }
 
   configs += [
@@ -131,8 +133,4 @@ 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" ]
-  }
 }