gn BUILD fixes for disabling enable_extensions and use_ash feature flags.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 96fa27f25d35736cefbe6d9d5c59f4ff092428b7..b93a9afedab20417c7b3cb411d096bb3a0e8cb6a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -144,8 +144,6 @@ group("both_gn_and_gyp") {
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",
       "//chrome/test/chromedriver:chromedriver_unittests",
-      "//extensions:extensions_browsertests",
-      "//extensions:extensions_unittests",
       "//gpu/gles2_conform_support:gles2_conform_test",
       "//jingle:jingle_unittests",
       "//net:hpack_example_generator",
@@ -192,6 +190,12 @@ group("both_gn_and_gyp") {
       "//ui/accessibility:accessibility_unittests",
       "//ui/app_list:app_list_unittests",
     ]
+    if (enable_extensions) {
+      deps += [
+        "//extensions:extensions_browsertests",
+        "//extensions:extensions_unittests",
+      ]
+    }

[Dirk Pranke, 2016/05/05 02:38:48]

Can you check if we can lift these blocks out of the os-specific if blocks,
since presumably enable_extensions and use_ash is not true on the platforms that
we're excluding?

[asaka, 2016/05/11 05:54:14]

I agree it sounds plausible, but I don't know how to verify it. Any suggestions
of targets/configurations I should test build?

From features.gni:
enable_extensions = !is_android && !is_ios

is_chromecast it also supported on is_linux afaict so I think I should test
build that if you can suggest the target?

   }
 
   if (!is_ios) {
@@ -270,13 +274,17 @@ group("both_gn_and_gyp") {
 
   if (use_aura) {
     deps += [
-      "//ash:ash_shell_with_content",
-      "//ash:ash_unittests",
       "//ui/app_list/presenter:app_list_presenter_unittests",
       "//ui/aura:aura_unittests",
       "//ui/aura:demo",
       "//ui/wm:wm_unittests",
     ]
+    if (use_ash) {
+      deps += [
+        "//ash:ash_shell_with_content",
+        "//ash:ash_unittests",
+      ]
+    }
   }
 
   if (use_ozone) {
@@ -651,11 +659,13 @@ group("gn_only") {
       "//components/mus/demo",
       "//components/mus/ws:tests",
       "//components/resource_provider:resource_provider_unittests",
-      "//mash:all",
       "//media/mojo/services:media_mojo_shell_unittests",
       "//mojo",
       "//ui/views/mus:views_mus_unittests",
     ]
+    if (use_ash) {
+      deps += [ "//mash:all" ]
+    }
   }
 
   if (is_linux && !is_chromeos && !is_chromecast) {