Aura on Android: content/browser

content/child/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/child/child.gni")
 
 source_set("child") {
@@ skipping 38 matching lines @@
       "webthemeengine_impl_default.h",
     ]
   }
 
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
 
   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",
       "npapi/plugin_host.cc",
       "npapi/plugin_host.h",
       "npapi/plugin_instance.cc",
       "npapi/plugin_instance.h",
       "npapi/plugin_lib.cc",
       "npapi/plugin_lib.h",
       "npapi/plugin_stream.cc",
@@ skipping 23 matching lines @@
     } else if (is_win) {
       sources -= [
         "npapi/plugin_stream_win.cc",
         "npapi/webplugin_delegate_impl_win.cc",
         "npapi/webplugin_ime_win.cc",
         "npapi/webplugin_ime_win.h",
       ]
     } 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 += [
     "//content:content_implementation",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   if (is_ios) {
     # iOS only needs a small portion of content; exclude all the
     # implementation, and re-include what is used.
     sources = []
   } else {
     deps += [
       "//components/scheduler:scheduler",
       "//content/app/resources",
       "//content/app/strings",
       "//crypto:platform",
       "//storage/common",
       "//third_party/WebKit/public:blink",
       "//third_party/WebKit/public:image_resources",
       "//third_party/WebKit/public:resources",
       "//third_party/npapi",
     ]
   }
 
   if (use_aura && is_mac) {
     # 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" ]
-  }
 }