Index: build/config/ios/ios_sdk.gni |
diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni |
index cb2708b76c107d329bf17c5611fbbcd76aa713b3..e06e767a188405ec3511f98ba01a0bde0813f5aa 100644 |
--- a/build/config/ios/ios_sdk.gni |
+++ b/build/config/ios/ios_sdk.gni |
@@ -1,4 +1,4 @@ |
-# Copyright 2014 The Chromium Authors. All rights reserved. |
+# Copyright 2015 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
@@ -15,6 +15,9 @@ declare_args() { |
# Version of iOS that we're targeting. |
ios_deployment_target = "6.0" |
sdefresne
2015/07/25 19:15:30
nit: gyp uses "7.0" as the default ios_deployment_
Dirk Pranke
2015/07/31 21:27:40
Done.
|
+ |
+ # The iOS Code signing identity to use |
+ ios_code_signing_identity = "" |
} |
sdefresne
2015/07/25 19:15:30
We need to provide a way to build for "armv7"/"arm
Dirk Pranke
2015/07/31 21:27:40
Will rework.
|
if (ios_sdk_path == "") { |
@@ -28,3 +31,21 @@ if (ios_sdk_path == "") { |
exec_script("ios_sdk.py", [ _ios_sdk_to_query ], "list lines") |
ios_sdk_path = _ios_sdk_result[0] |
} |
+ |
+if (use_ios_simulator) { |
sdefresne
2015/07/25 19:15:30
Change to
if (use_ios_simulator || !ios_enabled_c
Dirk Pranke
2015/07/31 21:27:40
Will rework.
|
+ # Always disable code signing on the simulator |
+ ios_code_signing_identity = "" |
+} else { |
+ # If an identity is not provided, look for one on the host |
+ if (ios_code_signing_identity == "") { |
+ _ios_identities = exec_script("find_signing_identity.py", [], "list lines") |
+ ios_code_signing_identity = _ios_identities[0] |
+ } |
+ |
+ if (ios_code_signing_identity == "") { |
+ print("Tried to prepare a device build without specifying a code signing") |
+ print("identity and could not detect one automatically either.") |
+ print("TIP: Simulator builds dont require code signing...") |
+ assert(false) |
+ } |
+} |