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

Unified Diff: build/toolchain/mac/BUILD.gn

Issue 2183053006: Add mac hermetic support to build/config/mac/sdk_info.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wrap ios toolchain in is_ios block Created 4 years, 5 months 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 | « build/config/mac/sdk_info.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 5ccda9a9bc0238eba7c6f79d233f622ef76d5fe7..e08b7dff9ac48599e6aee8248aee7c883dd00abd 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -8,7 +8,9 @@
import("../goma.gni")
import("//build/config/clang/clang.gni")
-import("//build/config/ios/ios_sdk.gni")
+if (is_ios) {
+ import("//build/config/ios/ios_sdk.gni")
+}
import("//build/config/mac/mac_sdk.gni")
import("//build/config/mac/symbols.gni")
@@ -400,22 +402,24 @@ mac_toolchain("clang_x64") {
toolchain_os = "mac"
}
-mac_toolchain("ios_clang_arm") {
- toolchain_cpu = "arm"
- toolchain_os = "ios"
-}
+if (is_ios) {
sdefresne 2016/07/28 17:36:31 I don't think this is necessary, instead you could
justincohen 2016/07/28 17:59:40 Generating files... ERROR at //build/toolchain/mac
Dirk Pranke 2016/07/28 19:07:20 That, plus it's probably better hygiene to not dec
+ mac_toolchain("ios_clang_arm") {
+ toolchain_cpu = "arm"
+ toolchain_os = "ios"
+ }
-mac_toolchain("ios_clang_arm64") {
- toolchain_cpu = "arm64"
- toolchain_os = "ios"
-}
+ mac_toolchain("ios_clang_arm64") {
+ toolchain_cpu = "arm64"
+ toolchain_os = "ios"
+ }
-mac_toolchain("ios_clang_x86") {
- toolchain_cpu = "x86"
- toolchain_os = "ios"
-}
+ mac_toolchain("ios_clang_x86") {
+ toolchain_cpu = "x86"
+ toolchain_os = "ios"
+ }
-mac_toolchain("ios_clang_x64") {
- toolchain_cpu = "x64"
- toolchain_os = "ios"
+ mac_toolchain("ios_clang_x64") {
+ toolchain_cpu = "x64"
+ toolchain_os = "ios"
+ }
}
« no previous file with comments | « build/config/mac/sdk_info.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698