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

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

Issue 2273623002: Migrated GN target :g711_test (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@real_master
Patch Set: Added the linker log Android dependency to rtc_base_approved in Gyp. Created 4 years, 4 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 | « .gn ('k') | webrtc/base/base.gyp » ('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 import("//build/config/crypto.gni") 9 import("//build/config/crypto.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 config("external_ssl_library") { 85 config("external_ssl_library") {
86 assert(rtc_ssl_root != "", 86 assert(rtc_ssl_root != "",
87 "You must specify rtc_ssl_root when rtc_build_ssl==0.") 87 "You must specify rtc_ssl_root when rtc_build_ssl==0.")
88 include_dirs = [ rtc_ssl_root ] 88 include_dirs = [ rtc_ssl_root ]
89 } 89 }
90 } 90 }
91 91
92 # The subset of rtc_base approved for use outside of libjingle. 92 # The subset of rtc_base approved for use outside of libjingle.
93 static_library("rtc_base_approved") { 93 static_library("rtc_base_approved") {
94 defines = [] 94 defines = []
95 libs = []
95 deps = [] 96 deps = []
96 configs += [ "..:common_config" ] 97 configs += [ "..:common_config" ]
97 public_configs = [ "..:common_inherited_config" ] 98 public_configs = [ "..:common_inherited_config" ]
98 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] 99 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
99 100
100 sources = [ 101 sources = [
101 "array_view.h", 102 "array_view.h",
102 "atomicops.h", 103 "atomicops.h",
103 "bind.h", 104 "bind.h",
104 "bitbuffer.cc", 105 "bitbuffer.cc",
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 "thread_checker.h", 164 "thread_checker.h",
164 "thread_checker_impl.cc", 165 "thread_checker_impl.cc",
165 "thread_checker_impl.h", 166 "thread_checker_impl.h",
166 "timestampaligner.cc", 167 "timestampaligner.cc",
167 "timestampaligner.h", 168 "timestampaligner.h",
168 "timeutils.cc", 169 "timeutils.cc",
169 "timeutils.h", 170 "timeutils.h",
170 "trace_event.h", 171 "trace_event.h",
171 ] 172 ]
172 173
174 if (is_android) {
175 libs += [ "log" ]
176 }
177
173 if (build_with_chromium) { 178 if (build_with_chromium) {
174 # Dependency on chromium's logging (in //base). 179 # Dependency on chromium's logging (in //base).
175 deps += [ "//base:base" ] 180 deps += [ "//base:base" ]
176 sources += [ 181 sources += [
177 "../../webrtc_overrides/webrtc/base/logging.cc", 182 "../../webrtc_overrides/webrtc/base/logging.cc",
178 "../../webrtc_overrides/webrtc/base/logging.h", 183 "../../webrtc_overrides/webrtc/base/logging.h",
179 ] 184 ]
180 include_dirs = [ "../../webrtc_overrides" ] 185 include_dirs = [ "../../webrtc_overrides" ]
181 } else { 186 } else {
182 sources += [ 187 sources += [
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 "java/src/org/webrtc/Logging.java", 709 "java/src/org/webrtc/Logging.java",
705 "java/src/org/webrtc/Size.java", 710 "java/src/org/webrtc/Size.java",
706 "java/src/org/webrtc/ThreadUtils.java", 711 "java/src/org/webrtc/ThreadUtils.java",
707 ] 712 ]
708 713
709 deps = [ 714 deps = [
710 "//base:base_java", 715 "//base:base_java",
711 ] 716 ]
712 } 717 }
713 } 718 }
OLDNEW
« no previous file with comments | « .gn ('k') | webrtc/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698