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

Side by Side Diff: build/common.gypi

Issue 14659007: Remove use_system_ffmpeg-related logic from media and other mainline gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more removals Created 7 years, 7 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 | build/linux/unbundle/ffmpeg.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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 'use_default_render_theme%': '<(use_default_render_theme)', 792 'use_default_render_theme%': '<(use_default_render_theme)',
793 'enable_settings_app%': '<(enable_settings_app)', 793 'enable_settings_app%': '<(enable_settings_app)',
794 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 794 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
795 'google_api_key%': '<(google_api_key)', 795 'google_api_key%': '<(google_api_key)',
796 'google_default_client_id%': '<(google_default_client_id)', 796 'google_default_client_id%': '<(google_default_client_id)',
797 'google_default_client_secret%': '<(google_default_client_secret)', 797 'google_default_client_secret%': '<(google_default_client_secret)',
798 'enable_managed_users%': '<(enable_managed_users)', 798 'enable_managed_users%': '<(enable_managed_users)',
799 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 799 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
800 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 800 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
801 801
802 # Use system ffmpeg instead of bundled one.
803 'use_system_ffmpeg%': 0,
804
805 # Use system mesa instead of bundled one. 802 # Use system mesa instead of bundled one.
806 'use_system_mesa%': 0, 803 'use_system_mesa%': 0,
807 804
808 # Use system nspr instead of the bundled one. 805 # Use system nspr instead of the bundled one.
809 'use_system_nspr%': 0, 806 'use_system_nspr%': 0,
810 807
811 # Use system protobuf instead of bundled one. 808 # Use system protobuf instead of bundled one.
812 'use_system_protobuf%': 0, 809 'use_system_protobuf%': 0,
813 810
814 # Use system yasm instead of bundled one. 811 # Use system yasm instead of bundled one.
(...skipping 3624 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 # settings in target dicts. SYMROOT is a special case, because many other 4436 # settings in target dicts. SYMROOT is a special case, because many other
4440 # Xcode variables depend on it, including variables such as 4437 # Xcode variables depend on it, including variables such as
4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4438 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4439 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4443 # files to appear (when present) in the UI as actual files and not red 4440 # files to appear (when present) in the UI as actual files and not red
4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4441 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4445 # and therefore SYMROOT, needs to be set at the project level. 4442 # and therefore SYMROOT, needs to be set at the project level.
4446 'SYMROOT': '<(DEPTH)/xcodebuild', 4443 'SYMROOT': '<(DEPTH)/xcodebuild',
4447 }, 4444 },
4448 } 4445 }
OLDNEW
« no previous file with comments | « no previous file | build/linux/unbundle/ffmpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698