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

Side by Side Diff: build/config/ios/ios_sdk.gni

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks needed to get base_unittests to compile Created 5 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 declare_args() { 5 declare_args() {
6 # SDK path to use. When empty this will use the default SDK based on the 6 # SDK path to use. When empty this will use the default SDK based on the
7 # value of use_ios_simulator. 7 # value of use_ios_simulator.
8 ios_sdk_path = "" 8 ios_sdk_path = ""
9 9
10 # Set to true when targeting a simulator build on iOS. False means that the 10 # Set to true when targeting a simulator build on iOS. False means that the
11 # target is for running on the device. The default value is to use the 11 # target is for running on the device. The default value is to use the
12 # Simulator except when targeting GYP's Xcode builds (for compat with the 12 # Simulator except when targeting GYP's Xcode builds (for compat with the
13 # existing GYP build). 13 # existing GYP build).
14 use_ios_simulator = true 14 use_ios_simulator = true
sdefresne 2015/07/25 19:15:30 nit: since gyp always generate the four possible c
Dirk Pranke 2015/07/31 21:27:40 Agreed. Good suggestion.
15 15
16 # Version of iOS that we're targeting. 16 # Version of iOS that we're targeting.
17 ios_deployment_target = "6.0" 17 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.
18
19 # The iOS Code signing identity to use
20 ios_code_signing_identity = ""
18 } 21 }
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.
19 22
20 if (ios_sdk_path == "") { 23 if (ios_sdk_path == "") {
21 # Compute default target. 24 # Compute default target.
22 if (use_ios_simulator) { 25 if (use_ios_simulator) {
23 _ios_sdk_to_query = "iphonesimulator" 26 _ios_sdk_to_query = "iphonesimulator"
24 } else { 27 } else {
25 _ios_sdk_to_query = "iphoneos" 28 _ios_sdk_to_query = "iphoneos"
26 } 29 }
27 _ios_sdk_result = 30 _ios_sdk_result =
28 exec_script("ios_sdk.py", [ _ios_sdk_to_query ], "list lines") 31 exec_script("ios_sdk.py", [ _ios_sdk_to_query ], "list lines")
29 ios_sdk_path = _ios_sdk_result[0] 32 ios_sdk_path = _ios_sdk_result[0]
30 } 33 }
34
35 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.
36 # Always disable code signing on the simulator
37 ios_code_signing_identity = ""
38 } else {
39 # If an identity is not provided, look for one on the host
40 if (ios_code_signing_identity == "") {
41 _ios_identities = exec_script("find_signing_identity.py", [], "list lines")
42 ios_code_signing_identity = _ios_identities[0]
43 }
44
45 if (ios_code_signing_identity == "") {
46 print("Tried to prepare a device build without specifying a code signing")
47 print("identity and could not detect one automatically either.")
48 print("TIP: Simulator builds dont require code signing...")
49 assert(false)
50 }
51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698