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

Side by Side Diff: build/common.gypi

Issue 11231046: Linux: add an option to build with system protobuf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/protoc.gypi » ('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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 'wix_path%': '<(wix_path)', 657 'wix_path%': '<(wix_path)',
658 'android_upstream_bringup%': '<(android_upstream_bringup)', 658 'android_upstream_bringup%': '<(android_upstream_bringup)',
659 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 659 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
660 'use_system_libjpeg%': '<(use_system_libjpeg)', 660 'use_system_libjpeg%': '<(use_system_libjpeg)',
661 'android_build_type%': '<(android_build_type)', 661 'android_build_type%': '<(android_build_type)',
662 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 662 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
663 'google_api_key%': '<(google_api_key)', 663 'google_api_key%': '<(google_api_key)',
664 'google_default_client_id%': '<(google_default_client_id)', 664 'google_default_client_id%': '<(google_default_client_id)',
665 'google_default_client_secret%': '<(google_default_client_secret)', 665 'google_default_client_secret%': '<(google_default_client_secret)',
666 666
667 # Use system protobuf instead of bundled one.
668 'use_system_protobuf%': 0,
669
667 # Use system yasm instead of bundled one. 670 # Use system yasm instead of bundled one.
668 'use_system_yasm%': 0, 671 'use_system_yasm%': 0,
669 672
670 # Default to enabled PIE; this is important for ASLR but we may need to be 673 # Default to enabled PIE; this is important for ASLR but we may need to be
671 # able to turn it off for various reasons. 674 # able to turn it off for various reasons.
672 'linux_disable_pie%': 0, 675 'linux_disable_pie%': 0,
673 676
674 # The release channel that this build targets. This is used to restrict 677 # The release channel that this build targets. This is used to restrict
675 # channel-specific build options, like which installer packages to create. 678 # channel-specific build options, like which installer packages to create.
676 # The default is 'all', which does no channel-specific filtering. 679 # The default is 'all', which does no channel-specific filtering.
(...skipping 2995 matching lines...) Expand 10 before | Expand all | Expand 10 after
3672 # settings in target dicts. SYMROOT is a special case, because many other 3675 # settings in target dicts. SYMROOT is a special case, because many other
3673 # Xcode variables depend on it, including variables such as 3676 # Xcode variables depend on it, including variables such as
3674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3677 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3678 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3676 # files to appear (when present) in the UI as actual files and not red 3679 # files to appear (when present) in the UI as actual files and not red
3677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3680 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3678 # and therefore SYMROOT, needs to be set at the project level. 3681 # and therefore SYMROOT, needs to be set at the project level.
3679 'SYMROOT': '<(DEPTH)/xcodebuild', 3682 'SYMROOT': '<(DEPTH)/xcodebuild',
3680 }, 3683 },
3681 } 3684 }
OLDNEW
« no previous file with comments | « no previous file | build/protoc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698