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

Side by Side Diff: webrtc/BUILD.gn

Issue 2392053003: Make sure vp9 actually gets excluded in gn as well. (Closed)
Patch Set: Also set define Created 4 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/modules/video_coding/BUILD.gn » ('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) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 # is still not found even if the execution of 123 # is still not found even if the execution of
124 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include 124 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include
125 # dirs on Linux. 125 # dirs on Linux.
126 all_dependent_configs = [ "dbus-glib" ] 126 all_dependent_configs = [ "dbus-glib" ]
127 } 127 }
128 128
129 if (rtc_relative_path) { 129 if (rtc_relative_path) {
130 defines += [ "EXPAT_RELATIVE_PATH" ] 130 defines += [ "EXPAT_RELATIVE_PATH" ]
131 } 131 }
132 132
133 if (!rtc_libvpx_build_vp9) {
134 defines += [ "RTC_DISABLE_VP9" ]
135 }
136
133 if (build_with_chromium) { 137 if (build_with_chromium) {
134 defines += [ 138 defines += [
135 # NOTICE: Since common_inherited_config is used in public_configs for our 139 # NOTICE: Since common_inherited_config is used in public_configs for our
136 # targets, there's no point including the defines in that config here. 140 # targets, there's no point including the defines in that config here.
137 # TODO(kjellander): Cleanup unused ones and move defines closer to the 141 # TODO(kjellander): Cleanup unused ones and move defines closer to the
138 # source when webrtc:4256 is completed. 142 # source when webrtc:4256 is completed.
139 "ENABLE_EXTERNAL_AUTH", 143 "ENABLE_EXTERNAL_AUTH",
140 "HAVE_OPENSSL_SSL_H", 144 "HAVE_OPENSSL_SSL_H",
141 "HAVE_SCTP", 145 "HAVE_SCTP",
142 "HAVE_SRTP", 146 "HAVE_SRTP",
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 792
789 deps = [ 793 deps = [
790 "//base:base_java_test_support", 794 "//base:base_java_test_support",
791 "//webrtc/api:libjingle_peerconnection_java", 795 "//webrtc/api:libjingle_peerconnection_java",
792 "//webrtc/api:libjingle_peerconnection_jni", 796 "//webrtc/api:libjingle_peerconnection_jni",
793 "//webrtc/examples:AppRTCMobile_javalib", 797 "//webrtc/examples:AppRTCMobile_javalib",
794 ] 798 ]
795 } 799 }
796 } 800 }
797 } 801 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698