Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index 265ddc066fd2b8f000fc3559885d42624a23dc59..68a647102604839e87792f48ae8b131de07bf130 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -24,7 +24,7 @@ declare_args() { |
root_extra_deps = [] |
} |
-# This file defines the following four main targets: |
+# This file defines the following three main targets: |
# |
# "both_gn_and_gyp" should list every root target (target that nothing else |
# depends on) built by GN that is also built in the GYP build. |
@@ -37,11 +37,6 @@ declare_args() { |
# build is, this may end up including targets that are actually defined in a |
# GYP build but not dependencies of GYP's "all" (and so not actually built). |
# |
-# "gn_visibility": targets that are normally not visible to top-level targets, |
-# but are built anyway by "all". Since we don't want any such targets, we |
-# have this placeholder to make sure hidden targets that aren't otherwise |
-# depended on yet are accounted for. |
-# |
# TODO(GYP): crbug.com/481694. Make sure that the above is true and there are |
# scripts run on the bots that enforce this. Once the GYP migration is over, |
# we can collapse all of these targets as desired. |
@@ -52,7 +47,6 @@ group("gn_all") { |
deps = [ |
":both_gn_and_gyp", |
":gn_only", |
- ":gn_visibility", |
] |
} |
@@ -153,7 +147,6 @@ group("both_gn_and_gyp") { |
"//ui/display:display_unittests", |
"//ui/events:events_unittests", |
"//ui/gfx:gfx_unittests", |
- "//ui/gl:gl_unittests", |
"//ui/touch_selection:ui_touch_selection_unittests", |
"//url:url_unittests", |
] |
@@ -226,6 +219,7 @@ group("both_gn_and_gyp") { |
"//third_party/android_tools:android_support_v13_java", |
"//third_party/android_tools:android_support_v7_appcompat_java", |
"//third_party/android_tools:android_support_v7_mediarouter_java", |
+ "//third_party/errorprone:chromium_errorprone", |
jbudorick
2015/05/07 18:49:26
I'm not sure that this needs to be in here, and I
raywilliams_chromium
2015/05/11 19:52:24
Done.
raywilliams_chromium
2015/05/11 19:52:24
I'll try taking this out and see if it still works
|
"//third_party/mesa", |
"//third_party/mockito:mockito_java", |
"//third_party/openmax_dl/dl", |
@@ -539,6 +533,7 @@ group("both_gn_and_gyp") { |
"//components:components_unittests", # TODO(GYP) |
"//content/test:content_browsertests", # TODO(GYP) |
"//content/test:content_perftests", # TODO(GYP) |
+ "//content/test:content_unittests", # TODO(GYP) |
"//extensions:extensions_browsertests", # TODO(GYP) |
"//extensions:extensions_unittests", # TODO(GYP) |
"//net:net_unittests", # TODO(GYP) |
@@ -579,7 +574,7 @@ group("gn_only") { |
testonly = true |
deps = [ |
- "//mandoline:all", |
+ "//mandoline:mandoline_all", |
] |
if (!is_android && !is_ios) { |
@@ -693,7 +688,8 @@ group("gn_mojo_targets") { |
"//media/mojo/interfaces:interfaces_python", |
"//media/mojo/services:cdm_service", |
"//media/mojo:tests", |
- "//mojo:tests", |
+ "//mojo/services:apptests", |
+ "//mojo/services:tests", |
"//net/interfaces:interfaces_python", |
"//third_party/mojo/src/mojo/edk/js/test:js_integration_tests", |
"//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python", |
@@ -707,13 +703,10 @@ group("gn_mojo_targets") { |
group("gn_visibility") { |
deps = [ |
- "//build/config/sanitizers:options_sources", |
- |
+ # "//build/config/sanitizers:options_sources", |
# "//third_party/pdfium:pdfium_embeddertests", # TODO(GYP): visibility? |
# "//third_party/pdfium:pdfium_unittests", # TODO(GYP): visibility? |
- |
- "//ui/resources:repack_ui_test_mac_locale_pack", |
- |
+ # "//ui/resources:repack_ui_test_mac_locale_pack", |
# "//v8:v8_snapshot", # TODO(GYP): visibility? |
# "//v8:postmortem-metadata", # TODO(GYP): visibility? |
] |
@@ -775,7 +768,6 @@ if (is_linux) { |
"//ui/display:display_unittests", # PASSES 2/25/2015 |
"//ui/events:events_unittests", # PASSES 2/25/2015 |
"//ui/gfx:gfx_unittests", # PASSES 2/25/2015 |
- "//ui/gl:gl_unittests", |
"//ui/touch_selection:ui_touch_selection_unittests", # PASSES 2/25/2015 |
"//ui/views:views_unittests", # PASSES (*) 2/25/2015 |
"//ui/wm:wm_unittests", # PASSES 2/25/2015 |
@@ -797,14 +789,13 @@ if (is_linux) { |
"//base:base_unittests", # PASSES 4/20/2015 |
"//cc:cc_unittests", # PASSES 4/17/2015 |
"//chrome_elf:chrome_elf_unittests", # FAILS 4/20/2015 |
- "//chrome/app_installer:app_installer_unittests", # PASSES 4/24/2015 |
- "//chrome/installer/util:installer_util_unittests", |
+ "//chrome/app_installer:app_installer_unittests", |
"//chrome/test:browser_tests", |
"//chrome/test:interactive_ui_tests", |
"//chrome/test:sync_integration_tests", # Note: need to turn off incremental linking for debug. |
"//chrome/test:unit_tests", |
"//chrome/test/chromedriver:chromedriver_unittests", # PASSES 4/20/2015 |
- "//components:components_browsertests", # PASSES 4/24/2015 |
+ "//components:components_browsertests", |
"//components:components_unittests", # PASSES 4/17/2015 |
"//courgette:courgette_unittests", # PASSES 4/20/2015 |
"//content/test:content_browsertests", |
@@ -847,13 +838,14 @@ if (is_linux) { |
"//ui/display:display_unittests", # PASSES 4/20/2015 |
"//ui/events:events_unittests", # PASSES 4/20/2015 |
"//ui/gfx:gfx_unittests", # PASSES (with assertion failure?) 4/20/2015 |
- "//ui/gl:gl_unittests", |
"//ui/message_center:message_center_unittests", # PASSES 4/20/2015 |
"//ui/touch_selection:ui_touch_selection_unittests", # PASSES 4/20/2015 |
"//ui/views:views_unittests", # TooltipControllerTest failures |
"//ui/wm:wm_unittests", # PASSES 4/21/2015 |
"//url:url_unittests", # PASSES 4/17/2015 |
+ # TODO(GYP) installer_util_unittests |
+ # TODO(GYP) app_installer_unittests |
# TODO(GYP) nacl_integration |
# TODO(GYP) telemetry_perf_unittests |
# TODO(GYP) telemetry_unittests |