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

Side by Side Diff: build/common.gypi

Issue 12302029: Linux: add a tool and code to make use_system_ffmpeg option more compatible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build/common.gypi Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/ffmpeg/ffmpeg_common.cc » ('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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 'enable_message_center%': '<(enable_message_center)', 734 'enable_message_center%': '<(enable_message_center)',
735 'use_default_render_theme%': '<(use_default_render_theme)', 735 'use_default_render_theme%': '<(use_default_render_theme)',
736 'enable_web_intents%': '<(enable_web_intents)', 736 'enable_web_intents%': '<(enable_web_intents)',
737 'enable_settings_app%': '<(enable_settings_app)', 737 'enable_settings_app%': '<(enable_settings_app)',
738 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 738 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
739 'google_api_key%': '<(google_api_key)', 739 'google_api_key%': '<(google_api_key)',
740 'google_default_client_id%': '<(google_default_client_id)', 740 'google_default_client_id%': '<(google_default_client_id)',
741 'google_default_client_secret%': '<(google_default_client_secret)', 741 'google_default_client_secret%': '<(google_default_client_secret)',
742 'enable_managed_users%': '<(enable_managed_users)', 742 'enable_managed_users%': '<(enable_managed_users)',
743 743
744 # Use system ffmpeg instead of bundled one.
745 'use_system_ffmpeg%': 0,
746
744 # Use system mesa instead of bundled one. 747 # Use system mesa instead of bundled one.
745 'use_system_mesa%': 0, 748 'use_system_mesa%': 0,
746 749
747 # Use system nspr instead of the bundled one. 750 # Use system nspr instead of the bundled one.
748 'use_system_nspr%': 0, 751 'use_system_nspr%': 0,
749 752
750 # Use system protobuf instead of bundled one. 753 # Use system protobuf instead of bundled one.
751 'use_system_protobuf%': 0, 754 'use_system_protobuf%': 0,
752 755
753 # Use system yasm instead of bundled one. 756 # Use system yasm instead of bundled one.
(...skipping 3289 matching lines...) Expand 10 before | Expand all | Expand 10 after
4043 # settings in target dicts. SYMROOT is a special case, because many other 4046 # settings in target dicts. SYMROOT is a special case, because many other
4044 # Xcode variables depend on it, including variables such as 4047 # Xcode variables depend on it, including variables such as
4045 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4046 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4047 # files to appear (when present) in the UI as actual files and not red 4050 # files to appear (when present) in the UI as actual files and not red
4048 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4049 # and therefore SYMROOT, needs to be set at the project level. 4052 # and therefore SYMROOT, needs to be set at the project level.
4050 'SYMROOT': '<(DEPTH)/xcodebuild', 4053 'SYMROOT': '<(DEPTH)/xcodebuild',
4051 }, 4054 },
4052 } 4055 }
OLDNEW
« no previous file with comments | « no previous file | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698