Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index 35610ce68b48ff1294c3f9b1546440cb89a10afd..a98860f42d561e25d895e6c4fda562fe457a709b 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -143,8 +143,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", |
"//gpu/khronos_glcts_support:khronos_glcts_test", |
"//jingle:jingle_unittests", |
@@ -242,7 +240,12 @@ group("both_gn_and_gyp") { |
deps += root_extra_deps |
if (enable_extensions) { |
- deps += [ "//extensions/shell:app_shell_unittests" ] |
+ deps += [ |
+ "//extensions:extensions_browsertests", |
+ "//extensions:extensions_unittests", |
+ "//extensions/shell:app_shell", |
+ "//extensions/shell:app_shell_unittests", |
+ ] |
} |
if (enable_media_router) { |
@@ -259,14 +262,18 @@ group("both_gn_and_gyp") { |
if (use_aura) { |
deps += [ |
- "//ash:ash_shell_with_content", |
- "//ash:ash_unittests", |
"//ui/app_list:app_list_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) { |
@@ -480,10 +487,6 @@ group("both_gn_and_gyp") { |
] |
} |
- if (enable_extensions) { |
- deps += [ "//extensions/shell:app_shell" ] |
- } |
- |
if (enable_nacl) { |
deps += [ "//components/nacl/loader:nacl_loader_unittests" ] |