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

Side by Side Diff: build/common.gypi

Issue 10827200: Update iossim.gyp to use src/build/ios/mac_build.gypi. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: address review comments, added gtest.gyp and common.gypi Created 8 years, 4 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 | testing/gtest.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 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 ['(branding=="Chrome" and buildtype=="Official")', { 886 ['(branding=="Chrome" and buildtype=="Official")', {
887 'linux_dump_symbols%': 1, 887 'linux_dump_symbols%': 1,
888 }], 888 }],
889 ], 889 ],
890 }], # os_posix==1 and OS!="mac" and OS!="ios" 890 }], # os_posix==1 and OS!="mac" and OS!="ios"
891 ['OS=="ios"', { 891 ['OS=="ios"', {
892 'disable_nacl%': 1, 892 'disable_nacl%': 1,
893 'use_system_bzip2%': 1, 893 'use_system_bzip2%': 1,
894 'use_system_libxml%': 1, 894 'use_system_libxml%': 1,
895 'use_system_sqlite%': 1, 895 'use_system_sqlite%': 1,
896
897 # Use a variable for the mac sdk, so that overriding this variable
898 # allows specifying the sdk that will be used for mac sub-builds.
stuartmorgan 2012/08/20 07:29:53 Let's make this a bit clearer. How about: The Mac
lliabraa 2012/08/20 13:47:42 Done.
899 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
896 }], 900 }],
897 ['OS=="android"', { 901 ['OS=="android"', {
898 # Location of Android NDK. 902 # Location of Android NDK.
899 'variables': { 903 'variables': {
900 'variables': { 904 'variables': {
901 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 905 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
902 # Android uses x86 instead of ia32 for their target_arch 906 # Android uses x86 instead of ia32 for their target_arch
903 # designation. 907 # designation.
904 # TODO(wistoch): Adjust the target_arch naming scheme to avoid 908 # TODO(wistoch): Adjust the target_arch naming scheme to avoid
905 # confusion. 909 # confusion.
(...skipping 2472 matching lines...) Expand 10 before | Expand all | Expand 10 after
3378 # 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
3379 # Xcode variables depend on it, including variables such as 3383 # Xcode variables depend on it, including variables such as
3380 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3381 # 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
3382 # 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
3383 # 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,
3384 # and therefore SYMROOT, needs to be set at the project level. 3388 # and therefore SYMROOT, needs to be set at the project level.
3385 'SYMROOT': '<(DEPTH)/xcodebuild', 3389 'SYMROOT': '<(DEPTH)/xcodebuild',
3386 }, 3390 },
3387 } 3391 }
OLDNEW
« no previous file with comments | « no previous file | testing/gtest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698