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

Unified Diff: BUILD.gn

Issue 1467803003: Get 'gn_all' building on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ios arm build, non-ios build Created 5 years 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
« no previous file with comments | « no previous file | build_overrides/webrtc.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 9845ff4d20ec7b3d8012d68f6274a15c1aa6f375..42228cddf56cd0404b9c299f7335081d258b322a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build_overrides/v8.gni")
+import("//build_overrides/webrtc.gni")
import("//media/media_options.gni")
import("//third_party/openh264/openh264_args.gni")
@@ -205,17 +206,22 @@ group("both_gn_and_gyp") {
]
} else {
deps += [
- "//ios/chrome:ios_chrome_unittests",
- "//ios/chrome/app",
- "//ios/chrome/browser",
- "//ios/chrome/common",
"//ios/net:ios_net_unittests",
- "//ios/public/provider/chrome/browser",
"//ios/public/provider/web",
"//ios/testing:ocmock_support_unittest",
"//ios/web:ios_web_unittests",
"//ios/web/shell:ios_web_shell",
]
+
+ if (ios_use_webrtc) {
+ deps += [
+ "//ios/chrome:ios_chrome_unittests",
+ "//ios/chrome/app",
+ "//ios/chrome/browser",
+ "//ios/chrome/common",
+ "//ios/public/provider/chrome/browser",
+ ]
+ }
}
deps += root_extra_deps
@@ -586,7 +592,7 @@ group("both_gn_and_gyp") {
deps += [ "//chromecast:cast_shell" ]
}
- if (is_ios || is_mac) {
+ if (is_mac) { # TODO(GYP) || is_ios
deps += [ "//media/cast:cast_h264_vt_encoder_unittests" ]
}
« no previous file with comments | « no previous file | build_overrides/webrtc.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698