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

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

Issue 1752873002: Use bundle_data and create_bundle to add support for iOS app bundle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-create-bundle
Patch Set: Remove conditional around bundle_data, use response_file_contents, clean description of compile_xca… Created 4 years, 9 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 | « build/config/ios/ios_gen_plist.py ('k') | build/config/ios/ios_sdk.py » ('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 bf1540c11c9f62f93730e519b1a71676211e2945..7a648d3d9498e81ebd6281ea55df739da1d74f17 100644
--- a/build/config/ios/ios_sdk.gni
+++ b/build/config/ios/ios_sdk.gni
@@ -6,6 +6,12 @@ declare_args() {
# SDK path to use. When empty this will use the default SDK based on the
# value of use_ios_simulator.
ios_sdk_path = ""
+ ios_sdk_name = ""
+ ios_sdk_version = ""
+ ios_sdk_platform = ""
+ xcode_version = ""
+ xcode_build = ""
+ machine_os_build = ""
use_ios_simulator = target_cpu == "x86" || target_cpu == "x64"
@@ -22,13 +28,26 @@ declare_args() {
if (ios_sdk_path == "") {
# Compute default target.
if (use_ios_simulator) {
- _ios_sdk_to_query = "iphonesimulator"
+ ios_sdk_name = "iphonesimulator"
+ ios_sdk_platform = "iPhoneSimulator"
} else {
- _ios_sdk_to_query = "iphoneos"
+ ios_sdk_name = "iphoneos"
+ ios_sdk_platform = "iPhoneOS"
+ }
+ _ios_sdk_result = exec_script("ios_sdk.py", [ ios_sdk_name ], "scope")
+ ios_sdk_path = _ios_sdk_result.ios_sdk_path
+ ios_sdk_version = _ios_sdk_result.ios_sdk_version
+ ios_sdk_build = _ios_sdk_result.ios_sdk_build
+ xcode_version = _ios_sdk_result.xcode_version
+ xcode_build = _ios_sdk_result.xcode_build
+ machine_os_build = _ios_sdk_result.machine_os_build
+ if (use_ios_simulator) {
+ # This is weird, but Xcode sets DTPlatformBuild to an empty field for
+ # simulator builds.
+ ios_platform_build = ""
+ } else {
+ ios_platform_build = ios_sdk_build
}
- _ios_sdk_result =
- exec_script("ios_sdk.py", [ _ios_sdk_to_query ], "list lines")
- ios_sdk_path = _ios_sdk_result[0]
}
if (use_ios_simulator) {
« no previous file with comments | « build/config/ios/ios_gen_plist.py ('k') | build/config/ios/ios_sdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698