Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: BUILD.gn

Issue 1411183010: Make MB aware of iOS bot configs and get iOS working. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rework to read GYP_DEFINES/gn_args from bot configs in MB Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index f58231fc4d16d6b9cdbed524e920c349566a2ae1..05fb68827364828b04c7b047753f7d53fccb8a12 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -44,10 +44,9 @@ declare_args() {
# on yet are accounted for.
#
# "All" is an alias for "gn_all". It exists for bot compatibility w/ GYP for
-# the iOS bots and the official builders, but should not be generally used
-# during the GYP->GN migration. We cannot guarantee that GN's "All" builds the
-# same set of targets as GYP's "All" does, because GYP's "All" supports
-# wildcards.
+# the iOS bots, but should not be generally used during the GYP->GN migration.
+# We cannot guarantee that GN's "All" builds the same set of targets as GYP's
+# "All" does, because GYP's "All" supports wildcards.
#
# Lastly, none of these targets are guaranteed to be the same as what ninja
# will build with "all". For more on how "all" works and the differences in how
@@ -68,7 +67,7 @@ group("gn_all") {
}
# TODO(GYP): This target exists for compatibility with GYP, specifically
-# for the iOS bots and the official builders.
+# for the iOS bots. We should update the iOS bots to not pass 'All'.
group("All") {
testonly = true
@@ -92,6 +91,7 @@ group("both_gn_and_gyp") {
"//skia:skia_unittests",
"//sql:sql_unittests",
"//sync:sync_unit_tests",
+ "//third_party/openh264/tests:openh264_unittests",
"//ui/base:ui_base_unittests",
"//ui/gfx:gfx_unittests",
"//url:url_unittests",
@@ -205,10 +205,7 @@ group("both_gn_and_gyp") {
} else {
deps += [
"//ios/net:ios_net_unittests",
- "//ios/public/provider/chrome/browser",
- "//ios/public/provider/web",
"//ios/testing:ocmock_support_unittest",
- "//ios/web/shell:ios_web_shell",
"//ios/web:ios_web_unittests",
]
}
@@ -309,7 +306,7 @@ group("both_gn_and_gyp") {
if (!is_chromecast) {
deps += [
- "//android_webview",
+ "//android_webview:system_webview_apk",
"//chrome/android:chrome_junit_tests",
"//chrome/android:chrome_public_apk",
"//chrome/android:chrome_public_test_apk",
@@ -354,8 +351,6 @@ group("both_gn_and_gyp") {
if (is_linux) {
# The following are definitely linux-only.
deps += [
- "//chrome:manpage",
- "//chrome:xdg_mime",
"//dbus:dbus_test_server",
"//dbus:dbus_unittests",
"//net:disk_cache_memory_test",
@@ -370,11 +365,6 @@ group("both_gn_and_gyp") {
if (is_chromeos || use_ash) {
deps += [ "//components/session_manager/core" ]
}
-
- if (is_chrome_branded && is_official_build) {
- # TODO(dpranke): add the linux_dump_symbols flag?
- deps += [ "//chrome:linux_symbols" ]
- }
}
if (is_ios || is_win || (is_linux && !is_chromeos)) {
@@ -398,6 +388,7 @@ group("both_gn_and_gyp") {
"//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
"//chrome/test/chromedriver:chromedriver_tests",
+ "//chrome/tools/profile_reset:jtl_compiler",
"//components:components_perftests",
"//content/test:content_gl_tests",
"//content/test:content_gl_benchmark",
@@ -428,6 +419,7 @@ group("both_gn_and_gyp") {
"//ppapi:pepper_hash_for_uma",
"//ppapi:ppapi_perftests",
"//sync:run_sync_testserver",
+ "//third_party/angle/src/tests:angle_end2end_tests",
"//third_party/angle/src/tests:angle_unittests",
"//third_party/codesighs:maptsvdifftool",
"//third_party/leveldatabase:env_chromium_unittests",
@@ -436,27 +428,12 @@ group("both_gn_and_gyp") {
"//ui/compositor:compositor_unittests",
]
- if (!is_linux) {
- # TODO(dpranke): Re-enable this once
- # https://chromium-review.googlesource.com/#/c/312298/1 is rolled
- # into chromium.
- deps += [ "//third_party/angle/src/tests:angle_end2end_tests" ]
- }
-
if (enable_extensions) {
deps += [ "//extensions/shell:app_shell" ]
}
if (enable_nacl) {
deps += [ "//components/nacl:nacl_loader_unittests" ]
-
- if (is_linux) {
- # TODO(dpranke): Figure out what platforms should actually have this.
- deps += [
- "//components/nacl:nacl_helper",
- "//components/nacl:helper_nonsfi",
- ]
- }
}
if (media_use_ffmpeg) {
@@ -695,7 +672,7 @@ group("gn_only") {
}
}
- if (is_android || is_linux || is_chromeos) {
+ if (is_android) {
deps += [ "//blimp" ]
}
« no previous file with comments | « no previous file | ios/build/bots/chromium.mac/iOS_Device_GN.json » ('j') | ios/build/bots/chromium.mac/iOS_Device_GN.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698