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

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

Issue 1611363003: Add support for iOS application bundle to GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-bundles
Patch Set: Filter .xcassets from the copy_bundle_data step Created 4 years, 11 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 ebbb7c9c57e1587440a7b1d912bd380a38487a10..c3bc2fc5eda8cfa1e805ecab174c1e0716c1781e 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,18 @@ 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_to_query ], "list lines")
- ios_sdk_path = _ios_sdk_result[0]
+ _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
+ 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) {

Powered by Google App Engine
This is Rietveld 408576698