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

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

Issue 2168873003: Query sdk-platform-path in build/config/mac/sdk_info.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/config/mac/sdk_info.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 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 ios_sdk_name = "" 9 ios_sdk_name = ""
10 ios_sdk_version = "" 10 ios_sdk_version = ""
11 ios_sdk_platform = "" 11 ios_sdk_platform = ""
12 ios_sdk_platform_path = ""
12 xcode_version = "" 13 xcode_version = ""
13 xcode_build = "" 14 xcode_build = ""
14 machine_os_build = "" 15 machine_os_build = ""
15 16
16 use_ios_simulator = current_cpu == "x86" || current_cpu == "x64" 17 use_ios_simulator = current_cpu == "x86" || current_cpu == "x64"
17 18
18 # Version of iOS that we're targeting. 19 # Version of iOS that we're targeting.
19 ios_deployment_target = "9.0" 20 ios_deployment_target = "9.0"
20 21
21 # The iOS Code signing identity to use 22 # The iOS Code signing identity to use
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 ios_sdk_name = "iphonesimulator" 69 ios_sdk_name = "iphonesimulator"
69 ios_sdk_platform = "iPhoneSimulator" 70 ios_sdk_platform = "iPhoneSimulator"
70 } else { 71 } else {
71 ios_sdk_name = "iphoneos" 72 ios_sdk_name = "iphoneos"
72 ios_sdk_platform = "iPhoneOS" 73 ios_sdk_platform = "iPhoneOS"
73 } 74 }
74 _ios_sdk_result = 75 _ios_sdk_result =
75 exec_script("//build/config/mac/sdk_info.py", [ ios_sdk_name ], "scope") 76 exec_script("//build/config/mac/sdk_info.py", [ ios_sdk_name ], "scope")
76 ios_sdk_path = _ios_sdk_result.sdk_path 77 ios_sdk_path = _ios_sdk_result.sdk_path
77 ios_sdk_version = _ios_sdk_result.sdk_version 78 ios_sdk_version = _ios_sdk_result.sdk_version
79 ios_sdk_platform_path = _ios_sdk_result.sdk_platform_path
78 ios_sdk_build = _ios_sdk_result.sdk_build 80 ios_sdk_build = _ios_sdk_result.sdk_build
79 xcode_version = _ios_sdk_result.xcode_version 81 xcode_version = _ios_sdk_result.xcode_version
80 xcode_build = _ios_sdk_result.xcode_build 82 xcode_build = _ios_sdk_result.xcode_build
81 machine_os_build = _ios_sdk_result.machine_os_build 83 machine_os_build = _ios_sdk_result.machine_os_build
82 if (use_ios_simulator) { 84 if (use_ios_simulator) {
83 # This is weird, but Xcode sets DTPlatformBuild to an empty field for 85 # This is weird, but Xcode sets DTPlatformBuild to an empty field for
84 # simulator builds. 86 # simulator builds.
85 ios_platform_build = "" 87 ios_platform_build = ""
86 } else { 88 } else {
87 ios_platform_build = ios_sdk_build 89 ios_platform_build = ios_sdk_build
(...skipping 13 matching lines...) Expand all
101 ios_code_signing_identity = _ios_identities[0] 103 ios_code_signing_identity = _ios_identities[0]
102 } 104 }
103 105
104 if (ios_code_signing_identity == "") { 106 if (ios_code_signing_identity == "") {
105 print("Tried to prepare a device build without specifying a code signing") 107 print("Tried to prepare a device build without specifying a code signing")
106 print("identity and could not detect one automatically either.") 108 print("identity and could not detect one automatically either.")
107 print("TIP: Simulator builds don't require code signing...") 109 print("TIP: Simulator builds don't require code signing...")
108 assert(false) 110 assert(false)
109 } 111 }
110 } 112 }
OLDNEW
« no previous file with comments | « no previous file | build/config/mac/sdk_info.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698