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

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: Review. 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') | no next file with comments »
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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 # All Chrome builds have breakpad symbols, but only process the 871 # All Chrome builds have breakpad symbols, but only process the
872 # symbols from official builds. 872 # symbols from official builds.
873 ['(branding=="Chrome" and buildtype=="Official")', { 873 ['(branding=="Chrome" and buildtype=="Official")', {
874 'linux_dump_symbols%': 1, 874 'linux_dump_symbols%': 1,
875 }], 875 }],
876 ], 876 ],
877 }], # os_posix==1 and OS!="mac" and OS!="ios" 877 }], # os_posix==1 and OS!="mac" and OS!="ios"
878 ['OS=="ios"', { 878 ['OS=="ios"', {
879 'disable_nacl%': 1, 879 'disable_nacl%': 1,
880 'use_system_libxml%': 1, 880 'use_system_libxml%': 1,
881 'use_system_sqlite%': 1,
881 }], 882 }],
882 ['OS=="android"', { 883 ['OS=="android"', {
883 # Location of Android NDK. 884 # Location of Android NDK.
884 'variables': { 885 'variables': {
885 'variables': { 886 'variables': {
886 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 887 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
887 # Android uses x86 instead of ia32 for their target_arch 888 # Android uses x86 instead of ia32 for their target_arch
888 # designation. 889 # designation.
889 # TODO(wistoch): Adjust the target_arch naming scheme to avoid 890 # TODO(wistoch): Adjust the target_arch naming scheme to avoid
890 # confusion. 891 # confusion.
(...skipping 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after
3381 # settings in target dicts. SYMROOT is a special case, because many other 3382 # settings in target dicts. SYMROOT is a special case, because many other
3382 # Xcode variables depend on it, including variables such as 3383 # Xcode variables depend on it, including variables such as
3383 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3384 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3385 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3385 # files to appear (when present) in the UI as actual files and not red 3386 # files to appear (when present) in the UI as actual files and not red
3386 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3387 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3387 # and therefore SYMROOT, needs to be set at the project level. 3388 # and therefore SYMROOT, needs to be set at the project level.
3388 'SYMROOT': '<(DEPTH)/xcodebuild', 3389 'SYMROOT': '<(DEPTH)/xcodebuild',
3389 }, 3390 },
3390 } 3391 }
OLDNEW
« no previous file with comments | « no previous file | sql/sql.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698