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

Side by Side Diff: build/common.gypi

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Buildfix Created 4 years, 11 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 | content/browser/DEPS » ('j') | media/media.gyp » ('J')
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 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 1537
1538 # Relative path to icu.gyp from this file. 1538 # Relative path to icu.gyp from this file.
1539 'icu_gyp_path': '../third_party/icu/icu.gyp', 1539 'icu_gyp_path': '../third_party/icu/icu.gyp',
1540 1540
1541 # IPC fuzzer is disabled by default. 1541 # IPC fuzzer is disabled by default.
1542 'enable_ipc_fuzzer%': 0, 1542 'enable_ipc_fuzzer%': 0,
1543 1543
1544 # Force disable libstdc++ debug mode. 1544 # Force disable libstdc++ debug mode.
1545 'disable_glibcxx_debug%': 0, 1545 'disable_glibcxx_debug%': 0,
1546 1546
1547 # Set to 1 to compile with MSE support for MPEG2 TS
1548 'enable_mpeg2ts_stream_parser%': 0,
1549
1550 # Support ChromeOS touchpad gestures with ozone. 1547 # Support ChromeOS touchpad gestures with ozone.
1551 'use_evdev_gestures%': 0, 1548 'use_evdev_gestures%': 0,
1552 1549
1553 # Default ozone platform (if no --ozone-platform flag). 1550 # Default ozone platform (if no --ozone-platform flag).
1554 'ozone_platform%': "", 1551 'ozone_platform%': "",
1555 1552
1556 # Ozone platforms to include in the build. 1553 # Ozone platforms to include in the build.
1557 'ozone_platform_caca%': 0, 1554 'ozone_platform_caca%': 0,
1558 'ozone_platform_cast%': 0, 1555 'ozone_platform_cast%': 0,
1559 'ozone_platform_egltest%': 0, 1556 'ozone_platform_egltest%': 0,
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 'p2p_apis%' : 0, 1871 'p2p_apis%' : 0,
1875 1872
1876 'gtest_target_type%': 'shared_library', 1873 'gtest_target_type%': 'shared_library',
1877 }], # OS=="android" 1874 }], # OS=="android"
1878 ['embedded==1', { 1875 ['embedded==1', {
1879 'use_system_fontconfig%': 0, 1876 'use_system_fontconfig%': 0,
1880 }, { 1877 }, {
1881 'use_system_fontconfig%': 1, 1878 'use_system_fontconfig%': 1,
1882 }], 1879 }],
1883 ['chromecast==1', { 1880 ['chromecast==1', {
1884 'enable_mpeg2ts_stream_parser%': 1,
1885 'use_custom_freetype%': 0, 1881 'use_custom_freetype%': 0,
1886 'use_playready%': 0, 1882 'use_playready%': 0,
1887 'conditions': [ 1883 'conditions': [
1888 ['target_arch=="arm"', { 1884 ['target_arch=="arm"', {
1889 'arm_arch%': '', 1885 'arm_arch%': '',
1890 'arm_tune%': 'cortex-a9', 1886 'arm_tune%': 'cortex-a9',
1891 'arm_thumb%': 1, 1887 'arm_thumb%': 1,
1892 }], 1888 }],
1893 # TODO(dalecurtis): What audio codecs does Chromecast want here? Sort 1889 # TODO(dalecurtis): What audio codecs does Chromecast want here? Sort
1894 # out and add configs if necessary. http://crbug.com/570754 1890 # out and add configs if necessary. http://crbug.com/570754
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
2763 'defines': ['IMAGE_LOADER_EXTENSION=1'], 2759 'defines': ['IMAGE_LOADER_EXTENSION=1'],
2764 }], 2760 }],
2765 ['enable_webrtc==1', { 2761 ['enable_webrtc==1', {
2766 'defines': ['ENABLE_WEBRTC=1'], 2762 'defines': ['ENABLE_WEBRTC=1'],
2767 }], 2763 }],
2768 ['enable_media_router==1', { 2764 ['enable_media_router==1', {
2769 'defines': ['ENABLE_MEDIA_ROUTER=1'], 2765 'defines': ['ENABLE_MEDIA_ROUTER=1'],
2770 }], 2766 }],
2771 ['proprietary_codecs==1', { 2767 ['proprietary_codecs==1', {
2772 'defines': ['USE_PROPRIETARY_CODECS'], 2768 'defines': ['USE_PROPRIETARY_CODECS'],
2773 'conditions': [
2774 ['enable_mpeg2ts_stream_parser==1', {
2775 'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'],
2776 }],
2777 ],
2778 }], 2769 }],
2779 ['enable_viewport==1', { 2770 ['enable_viewport==1', {
2780 'defines': ['ENABLE_VIEWPORT'], 2771 'defines': ['ENABLE_VIEWPORT'],
2781 }], 2772 }],
2782 ['enable_pepper_cdms==1', { 2773 ['enable_pepper_cdms==1', {
2783 'defines': ['ENABLE_PEPPER_CDMS'], 2774 'defines': ['ENABLE_PEPPER_CDMS'],
2784 }], 2775 }],
2785 ['enable_browser_cdms==1', { 2776 ['enable_browser_cdms==1', {
2786 'defines': ['ENABLE_BROWSER_CDMS'], 2777 'defines': ['ENABLE_BROWSER_CDMS'],
2787 }], 2778 }],
(...skipping 3633 matching lines...) Expand 10 before | Expand all | Expand 10 after
6421 # settings in target dicts. SYMROOT is a special case, because many other 6412 # settings in target dicts. SYMROOT is a special case, because many other
6422 # Xcode variables depend on it, including variables such as 6413 # Xcode variables depend on it, including variables such as
6423 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6414 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6424 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6415 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6425 # files to appear (when present) in the UI as actual files and not red 6416 # files to appear (when present) in the UI as actual files and not red
6426 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6417 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6427 # and therefore SYMROOT, needs to be set at the project level. 6418 # and therefore SYMROOT, needs to be set at the project level.
6428 'SYMROOT': '<(DEPTH)/xcodebuild', 6419 'SYMROOT': '<(DEPTH)/xcodebuild',
6429 }, 6420 },
6430 } 6421 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/DEPS » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698