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

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

Issue 2361623004: GN: Change rtc_source_set targets --> rtc_static_library (Closed)
Patch Set: Restored accidental rebase errors. 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 | « webrtc/BUILD.gn ('k') | webrtc/audio/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 if (is_android) { 10 if (is_android) {
(...skipping 25 matching lines...) Expand all
36 36
37 config("libjingle_peerconnection_warnings_config") { 37 config("libjingle_peerconnection_warnings_config") {
38 # GN orders flags on a target before flags from configs. The default config 38 # GN orders flags on a target before flags from configs. The default config
39 # adds these flags so to cancel them out they need to come from a config and 39 # adds these flags so to cancel them out they need to come from a config and
40 # cannot be on the target directly. 40 # cannot be on the target directly.
41 if (!is_win && !is_clang) { 41 if (!is_win && !is_clang) {
42 cflags = [ "-Wno-maybe-uninitialized" ] # Only exists for GCC. 42 cflags = [ "-Wno-maybe-uninitialized" ] # Only exists for GCC.
43 } 43 }
44 } 44 }
45 45
46 rtc_source_set("libjingle_peerconnection") { 46 rtc_static_library("libjingle_peerconnection") {
47 cflags = [] 47 cflags = []
48 sources = [ 48 sources = [
49 "audiotrack.cc", 49 "audiotrack.cc",
50 "audiotrack.h", 50 "audiotrack.h",
51 "datachannel.cc", 51 "datachannel.cc",
52 "datachannel.h", 52 "datachannel.h",
53 "datachannelinterface.h", 53 "datachannelinterface.h",
54 "dtmfsender.cc", 54 "dtmfsender.cc",
55 "dtmfsender.h", 55 "dtmfsender.h",
56 "dtmfsenderinterface.h", 56 "dtmfsenderinterface.h",
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 # for a target before flags from configs, the only way to disable such 153 # for a target before flags from configs, the only way to disable such
154 # warnings is by having them in a separate config, loaded from the target. 154 # warnings is by having them in a separate config, loaded from the target.
155 if (!is_win) { 155 if (!is_win) {
156 cflags = [ 156 cflags = [
157 "-Wno-sign-compare", 157 "-Wno-sign-compare",
158 "-Wno-unused-variable", 158 "-Wno-unused-variable",
159 ] 159 ]
160 } 160 }
161 } 161 }
162 162
163 rtc_source_set("libjingle_peerconnection_jni") { 163 rtc_static_library("libjingle_peerconnection_jni") {
164 sources = [ 164 sources = [
165 "android/jni/androidmediacodeccommon.h", 165 "android/jni/androidmediacodeccommon.h",
166 "android/jni/androidmediadecoder_jni.cc", 166 "android/jni/androidmediadecoder_jni.cc",
167 "android/jni/androidmediadecoder_jni.h", 167 "android/jni/androidmediadecoder_jni.h",
168 "android/jni/androidmediaencoder_jni.cc", 168 "android/jni/androidmediaencoder_jni.cc",
169 "android/jni/androidmediaencoder_jni.h", 169 "android/jni/androidmediaencoder_jni.h",
170 "android/jni/androidmetrics_jni.cc", 170 "android/jni/androidmetrics_jni.cc",
171 "android/jni/androidnetworkmonitor_jni.cc", 171 "android/jni/androidnetworkmonitor_jni.cc",
172 "android/jni/androidnetworkmonitor_jni.h", 172 "android/jni/androidnetworkmonitor_jni.h",
173 "android/jni/androidvideotracksource_jni.cc", 173 "android/jni/androidvideotracksource_jni.cc",
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 shared_libraries = [ ":libjingle_peerconnection_so" ] 465 shared_libraries = [ ":libjingle_peerconnection_so" ]
466 } 466 }
467 467
468 android_resources("libjingle_peerconnection_android_unittest_resources") { 468 android_resources("libjingle_peerconnection_android_unittest_resources") {
469 resource_dirs = [ "androidtests/res" ] 469 resource_dirs = [ "androidtests/res" ]
470 custom_package = "org.webrtc" 470 custom_package = "org.webrtc"
471 } 471 }
472 } 472 }
473 } 473 }
OLDNEW
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/audio/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698