diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-04 12:52:03 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-04 12:52:03 +0000 |
| commit | 4663822bc9e075c3304b7b9f48b10c5696fe7edc (patch) | |
| tree | 4a9f678a0aa604d8d16cdc6ddf468821270c0de7 /gyp/common_variables.gypi | |
| parent | 7cc7f494796afc681355b15e88c57ef2709a9220 (diff) | |
Allow Xcode to change paths to frameworks based on whether a device or simulator was selected.
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6590068
git-svn-id: http://skia.googlecode.com/svn/trunk@5802 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/common_variables.gypi')
| -rw-r--r-- | gyp/common_variables.gypi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index ae77c847e5..bf6d9189ad 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -77,8 +77,6 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - 'ios_sdk_version%': '6.0', 'skia_osx_sdkroot%': 'macosx10.6', }, @@ -97,8 +95,7 @@ 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_static_initializers%': '<(skia_static_initializers)', - 'ios_sdk_version%': '<(ios_sdk_version)', - 'ios_sdk_dir%': '<(ios_sdk_dir)', + 'ios_sdk_version%': '6.0', 'conditions': [ ['skia_os == "ios"', { |