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

Side by Side Diff: build/common.gypi

Issue 10696219: GYP changes to get sql and sqlite building on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 | sql/sql.gyp » ('j') | third_party/sqlite/sqlite.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 # Native Client is enabled by default. 825 # Native Client is enabled by default.
826 'disable_nacl%': 0, 826 'disable_nacl%': 0,
827 827
828 'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))', 828 'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
829 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', 829 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
830 830
831 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', 831 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
832 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', 832 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
833 833
834 'conditions': [ 834 'conditions': [
835 ['OS == "ios"', {
836 'use_system_sqlite': 1,
stuartmorgan 2012/07/13 12:18:10 Put this in the existing section a bit further dow
837 }],
835 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', { 838 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', {
836 'windows_sdk_path%': '<(windows_sdk_default_path)', 839 'windows_sdk_path%': '<(windows_sdk_default_path)',
837 }, { 840 }, {
838 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 841 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
839 }], 842 }],
840 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 843 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
841 'directx_sdk_path%': '<(directx_sdk_default_path)', 844 'directx_sdk_path%': '<(directx_sdk_default_path)',
842 }, { 845 }, {
843 'directx_sdk_path%': '$(DXSDK_DIR)', 846 'directx_sdk_path%': '$(DXSDK_DIR)',
844 }], 847 }],
(...skipping 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after
3296 # settings in target dicts. SYMROOT is a special case, because many other 3299 # settings in target dicts. SYMROOT is a special case, because many other
3297 # Xcode variables depend on it, including variables such as 3300 # Xcode variables depend on it, including variables such as
3298 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3301 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3299 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3302 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3300 # files to appear (when present) in the UI as actual files and not red 3303 # files to appear (when present) in the UI as actual files and not red
3301 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3304 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3302 # and therefore SYMROOT, needs to be set at the project level. 3305 # and therefore SYMROOT, needs to be set at the project level.
3303 'SYMROOT': '<(DEPTH)/xcodebuild', 3306 'SYMROOT': '<(DEPTH)/xcodebuild',
3304 }, 3307 },
3305 } 3308 }
OLDNEW
« no previous file with comments | « no previous file | sql/sql.gyp » ('j') | third_party/sqlite/sqlite.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698