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

Side by Side Diff: build/common.gypi

Issue 1770683002: Revert "about_flags.cc entry for WebRTC-H264WithOpenH264FFmpeg" (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | chrome/app/generated_resources.grd » ('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 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after
2173 'grit_defines': ['-D', 'enable_settings_app'], 2173 'grit_defines': ['-D', 'enable_settings_app'],
2174 }], 2174 }],
2175 ['use_concatenated_impulse_responses==1', { 2175 ['use_concatenated_impulse_responses==1', {
2176 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 2176 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
2177 }], 2177 }],
2178 ['enable_media_router==1', { 2178 ['enable_media_router==1', {
2179 'grit_defines': ['-D', 'enable_media_router'], 2179 'grit_defines': ['-D', 'enable_media_router'],
2180 }], 2180 }],
2181 ['enable_webrtc==1', { 2181 ['enable_webrtc==1', {
2182 'grit_defines': ['-D', 'enable_webrtc'], 2182 'grit_defines': ['-D', 'enable_webrtc'],
2183 'includes': [
2184 '../third_party/webrtc/build/common.gypi',
2185 ],
2186 'conditions': [
2187 ['rtc_use_h264==1', {
2188 'grit_defines': ['-D', 'rtc_use_h264'],
2189 }],
2190 ],
2191 }], 2183 }],
2192 ['enable_hangout_services_extension==1', { 2184 ['enable_hangout_services_extension==1', {
2193 'grit_defines': ['-D', 'enable_hangout_services_extension'], 2185 'grit_defines': ['-D', 'enable_hangout_services_extension'],
2194 }], 2186 }],
2195 ['enable_task_manager==1', { 2187 ['enable_task_manager==1', {
2196 'grit_defines': ['-D', 'enable_task_manager'], 2188 'grit_defines': ['-D', 'enable_task_manager'],
2197 }], 2189 }],
2198 ['notifications==1', { 2190 ['notifications==1', {
2199 'grit_defines': ['-D', 'enable_notifications'], 2191 'grit_defines': ['-D', 'enable_notifications'],
2200 }], 2192 }],
(...skipping 4153 matching lines...) Expand 10 before | Expand all | Expand 10 after
6354 # settings in target dicts. SYMROOT is a special case, because many other 6346 # settings in target dicts. SYMROOT is a special case, because many other
6355 # Xcode variables depend on it, including variables such as 6347 # Xcode variables depend on it, including variables such as
6356 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6348 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6357 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6349 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6358 # files to appear (when present) in the UI as actual files and not red 6350 # files to appear (when present) in the UI as actual files and not red
6359 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6351 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6360 # and therefore SYMROOT, needs to be set at the project level. 6352 # and therefore SYMROOT, needs to be set at the project level.
6361 'SYMROOT': '<(DEPTH)/xcodebuild', 6353 'SYMROOT': '<(DEPTH)/xcodebuild',
6362 }, 6354 },
6363 } 6355 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698