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

Side by Side Diff: webrtc/build/common.gypi

Issue 1368933002: Revert of Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-clean
Patch Set: Created 5 years, 2 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 | webrtc/engine_configurations.h » ('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 WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # This file contains common settings for building WebRTC components. 9 # This file contains common settings for building WebRTC components.
10 10
(...skipping 24 matching lines...) Expand all
35 }, 35 },
36 'build_with_chromium%': '<(build_with_chromium)', 36 'build_with_chromium%': '<(build_with_chromium)',
37 'build_with_libjingle%': '<(build_with_libjingle)', 37 'build_with_libjingle%': '<(build_with_libjingle)',
38 'webrtc_root%': '<(webrtc_root)', 38 'webrtc_root%': '<(webrtc_root)',
39 'apk_tests_path%': '<(apk_tests_path)', 39 'apk_tests_path%': '<(apk_tests_path)',
40 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 40 'modules_java_gyp_path%': '<(modules_java_gyp_path)',
41 'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8', 41 'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
42 'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9', 42 'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
43 'include_opus%': 1, 43 'include_opus%': 1,
44 'opus_dir%': '<(DEPTH)/third_party/opus', 44 'opus_dir%': '<(DEPTH)/third_party/opus',
45
46 # Enable to use the Mozilla internal settings.
47 'build_with_mozilla%': 0,
48 }, 45 },
49 'build_with_chromium%': '<(build_with_chromium)', 46 'build_with_chromium%': '<(build_with_chromium)',
50 'build_with_libjingle%': '<(build_with_libjingle)', 47 'build_with_libjingle%': '<(build_with_libjingle)',
51 'build_with_mozilla%': '<(build_with_mozilla)',
52 'webrtc_root%': '<(webrtc_root)', 48 'webrtc_root%': '<(webrtc_root)',
53 'apk_tests_path%': '<(apk_tests_path)', 49 'apk_tests_path%': '<(apk_tests_path)',
54 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 50 'modules_java_gyp_path%': '<(modules_java_gyp_path)',
55 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', 51 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
56 'webrtc_vp9_dir%': '<(webrtc_vp9_dir)', 52 'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
57 'include_opus%': '<(include_opus)', 53 'include_opus%': '<(include_opus)',
58 'rtc_relative_path%': 1, 54 'rtc_relative_path%': 1,
59 'external_libraries%': '0', 55 'external_libraries%': '0',
60 'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/', 56 'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/',
61 # openssl needs to be defined or gyp will complain. Is is only used when 57 # openssl needs to be defined or gyp will complain. Is is only used when
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 'build_libvpx%': 1, 91 'build_libvpx%': 1,
96 'build_libyuv%': 1, 92 'build_libyuv%': 1,
97 'build_openmax_dl%': 1, 93 'build_openmax_dl%': 1,
98 'build_opus%': 1, 94 'build_opus%': 1,
99 'build_ssl%': 1, 95 'build_ssl%': 1,
100 'build_vp9%': 1, 96 'build_vp9%': 1,
101 97
102 # Disable by default 98 # Disable by default
103 'have_dbus_glib%': 0, 99 'have_dbus_glib%': 0,
104 100
101 # Enable to use the Mozilla internal settings.
102 'build_with_mozilla%': 0,
103
105 # Make it possible to provide custom locations for some libraries. 104 # Make it possible to provide custom locations for some libraries.
106 'libvpx_dir%': '<(DEPTH)/third_party/libvpx', 105 'libvpx_dir%': '<(DEPTH)/third_party/libvpx',
107 'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 106 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
108 'opus_dir%': '<(opus_dir)', 107 'opus_dir%': '<(opus_dir)',
109 108
110 # Use Java based audio layer as default for Android. 109 # Use Java based audio layer as default for Android.
111 # Change this setting to 1 to use Open SL audio instead. 110 # Change this setting to 1 to use Open SL audio instead.
112 # TODO(henrika): add support for Open SL ES. 111 # TODO(henrika): add support for Open SL ES.
113 'enable_android_opensl%': 0, 112 'enable_android_opensl%': 0,
114 113
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 # of a more specific macro. 446 # of a more specific macro.
448 'defines': [ 447 'defines': [
449 'WEBRTC_POSIX', 448 'WEBRTC_POSIX',
450 ], 449 ],
451 }], 450 }],
452 ], 451 ],
453 }, 452 },
454 }, # target_defaults 453 }, # target_defaults
455 } 454 }
456 455
OLDNEW
« no previous file with comments | « no previous file | webrtc/engine_configurations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698