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

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: fixed comment based on review feedback. 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'icu_use_data_file_flag%': 1, 893 'icu_use_data_file_flag%': 1,
894 'use_system_bzip2%': 1, 894 'use_system_bzip2%': 1,
895 'use_system_libxml%': 1, 895 'use_system_libxml%': 1,
896 'use_system_sqlite%': 1, 896 'use_system_sqlite%': 1,
897
898 # The Mac SDK is set for iOS builds and passed through to Mac
899 # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
900 # overridden from the command line the same way it is for a Mac build.
901 'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)',
897 }], 902 }],
898 ['OS=="android"', { 903 ['OS=="android"', {
899 # Location of Android NDK. 904 # Location of Android NDK.
900 'variables': { 905 'variables': {
901 'variables': { 906 'variables': {
902 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 907 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
903 # Android uses x86 instead of ia32 for their target_arch 908 # Android uses x86 instead of ia32 for their target_arch
904 # designation. 909 # designation.
905 # TODO(wistoch): Adjust the target_arch naming scheme to avoid 910 # TODO(wistoch): Adjust the target_arch naming scheme to avoid
906 # confusion. 911 # confusion.
(...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3388 # settings in target dicts. SYMROOT is a special case, because many other 3393 # settings in target dicts. SYMROOT is a special case, because many other
3389 # Xcode variables depend on it, including variables such as 3394 # Xcode variables depend on it, including variables such as
3390 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3395 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3391 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3396 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3392 # files to appear (when present) in the UI as actual files and not red 3397 # files to appear (when present) in the UI as actual files and not red
3393 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3398 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3394 # and therefore SYMROOT, needs to be set at the project level. 3399 # and therefore SYMROOT, needs to be set at the project level.
3395 'SYMROOT': '<(DEPTH)/xcodebuild', 3400 'SYMROOT': '<(DEPTH)/xcodebuild',
3396 }, 3401 },
3397 } 3402 }
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