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

Unified Diff: build/config/ios/ios_sdk.gni

Issue 2437593005: Fix compilation of uber-fat binaries. (Closed)
Patch Set: Fix typo in native_client_sdk/PRESUBMIT.py Created 4 years, 2 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 | « no previous file | build/config/ios/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ios/ios_sdk.gni
diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni
index 0a3cded59cf1661546695f3a589ae8ad7057f0e4..88f128330a0c1d4b41618ac0164ff3a9deaa7372 100644
--- a/build/config/ios/ios_sdk.gni
+++ b/build/config/ios/ios_sdk.gni
@@ -14,8 +14,6 @@ declare_args() {
xcode_build = ""
machine_os_build = ""
- use_ios_simulator = current_cpu == "x86" || current_cpu == "x64"
-
# Version of iOS that we're targeting.
ios_deployment_target = "9.0"
@@ -44,6 +42,8 @@ declare_args() {
assert(custom_toolchain == "" || additional_target_cpus == [],
"cannot define both custom_toolchain and additional_target_cpus")
+use_ios_simulator = current_cpu == "x86" || current_cpu == "x64"
+
# Initialize additional_toolchains from additional_target_cpus. Assert here
# that the list does not contains $target_cpu nor duplicates as this would
# cause weird errors during the build.
« no previous file with comments | « no previous file | build/config/ios/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698