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

Side by Side Diff: webrtc/api/BUILD.gn

Issue 2128813002: Harmonize WebRTC gyp and gn flags. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 5 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/base/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) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 import("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 # Exclude the targets below from the Chromium build since they cannot be built 133 # Exclude the targets below from the Chromium build since they cannot be built
134 # due to incompability with Chromium's logging implementation. 134 # due to incompability with Chromium's logging implementation.
135 if (is_android && !build_with_chromium) { 135 if (is_android && !build_with_chromium) {
136 config("libjingle_peerconnection_jni_warnings_config") { 136 config("libjingle_peerconnection_jni_warnings_config") {
137 # The warnings below are enabled by default. Since GN orders compiler flags 137 # The warnings below are enabled by default. Since GN orders compiler flags
138 # for a target before flags from configs, the only way to disable such 138 # for a target before flags from configs, the only way to disable such
139 # warnings is by having them in a separate config, loaded from the target. 139 # warnings is by having them in a separate config, loaded from the target.
140 if (!is_win) { 140 if (!is_win) {
141 cflags = [ 141 cflags = [
142 "-Wno-sign-compare", 142 "-Wno-sign-compare",
143 "-Wno-unused-variable",
144 ] 143 ]
145 } 144 }
146 } 145 }
147 146
148 source_set("libjingle_peerconnection_jni") { 147 source_set("libjingle_peerconnection_jni") {
149 sources = [ 148 sources = [
150 "android/jni/androidmediacodeccommon.h", 149 "android/jni/androidmediacodeccommon.h",
151 "android/jni/androidmediadecoder_jni.cc", 150 "android/jni/androidmediadecoder_jni.cc",
152 "android/jni/androidmediadecoder_jni.h", 151 "android/jni/androidmediadecoder_jni.h",
153 "android/jni/androidmediaencoder_jni.cc", 152 "android/jni/androidmediaencoder_jni.cc",
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 "../pc:rtc_pc", 390 "../pc:rtc_pc",
392 "../system_wrappers:metrics_default", 391 "../system_wrappers:metrics_default",
393 "//testing/gmock", 392 "//testing/gmock",
394 ] 393 ]
395 394
396 if (is_android) { 395 if (is_android) {
397 deps += [ "//testing/android/native_test:native_test_support" ] 396 deps += [ "//testing/android/native_test:native_test_support" ]
398 } 397 }
399 } 398 }
400 } 399 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698