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

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

Issue 239543013: Work on Mac GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings Created 6 years, 8 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
Index: build/config/ios/ios_sdk.gni
diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni
index e6c3e126485c989fcd930896eb2760df0f59d71d..6b81a0308c0549346eb8c0ea00ea1d9f98854dd9 100644
--- a/build/config/ios/ios_sdk.gni
+++ b/build/config/ios/ios_sdk.gni
@@ -11,19 +11,12 @@ declare_args() {
# target is for running on the device. The default value is to use the
# Simulator except when targeting GYP's Xcode builds (for compat with the
# existing GYP build).
- use_ios_simulator = !is_gyp_xcode_generator
+ use_ios_simulator = true
# Version of iOS that we're targeting.
ios_deployment_target = "6.0"
}
-# Simulator flag explicitly passed in.
-if (!is_gyp_xcode_generator) {
- # The Ninja build currently only targets the simulator.
- assert(use_ios_simulator,
- "You can't do an iOS device build using Ninja yet.")
-}
-
if (ios_sdk_path == "") {
# Compute default target.
if (use_ios_simulator) {
« no previous file with comments | « build/config/crypto.gni ('k') | build/toolchain/android/BUILD.gn » ('j') | skia/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698