Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 } | 72 } | 
| 73 | 73 | 
| 74 if (!rtc_build_ssl) { | 74 if (!rtc_build_ssl) { | 
| 75 config("external_ssl_library") { | 75 config("external_ssl_library") { | 
| 76 assert(rtc_ssl_root != "", | 76 assert(rtc_ssl_root != "", | 
| 77 "You must specify rtc_ssl_root when rtc_build_ssl==0.") | 77 "You must specify rtc_ssl_root when rtc_build_ssl==0.") | 
| 78 include_dirs = [ rtc_ssl_root ] | 78 include_dirs = [ rtc_ssl_root ] | 
| 79 } | 79 } | 
| 80 } | 80 } | 
| 81 | 81 | 
| 82 if (rtc_enable_protobuf) { | |
| 83 source_set("protobuf_utils") { | |
| 84 sources = [ | |
| 85 "protobuf_utils.h", | |
| 
 
kwiberg-webrtc
2017/03/22 10:03:22
This file contains #ifdefs on WEBRTC_ENABLE_PROTOB
 
mbonadei
2017/03/23 16:13:58
Already explained in the other comment. I was doin
 
 | |
| 86 ] | |
| 87 public_deps = [ | |
| 88 "//third_party/protobuf:protobuf_lite", | |
| 
 
kwiberg-webrtc
2017/03/22 10:03:22
Why is this a public dependency?
 
mbonadei
2017/03/23 16:13:58
This is a good question.
I tried to avoid the pub
 
kwiberg-webrtc
2017/03/24 13:02:07
public_deps is used to "export" dependencies from
 
mbonadei
2017/03/30 07:27:27
Sorry for the late reply.
I am getting the error
 
 | |
| 89 ] | |
| 90 } | |
| 91 } | |
| 92 | |
| 82 # The subset of rtc_base approved for use outside of libjingle. | 93 # The subset of rtc_base approved for use outside of libjingle. | 
| 83 rtc_static_library("rtc_base_approved") { | 94 rtc_static_library("rtc_base_approved") { | 
| 84 defines = [] | 95 defines = [] | 
| 85 libs = [] | 96 libs = [] | 
| 86 deps = [] | 97 deps = [] | 
| 87 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] | 98 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] | 
| 88 | 99 | 
| 89 sources = [ | 100 sources = [ | 
| 90 "array_view.h", | 101 "array_view.h", | 
| 91 "arraysize.h", | 102 "arraysize.h", | 
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 881 | 892 | 
| 882 if (is_android) { | 893 if (is_android) { | 
| 883 android_library("base_java") { | 894 android_library("base_java") { | 
| 884 java_files = [ | 895 java_files = [ | 
| 885 "java/src/org/webrtc/Logging.java", | 896 "java/src/org/webrtc/Logging.java", | 
| 886 "java/src/org/webrtc/Size.java", | 897 "java/src/org/webrtc/Size.java", | 
| 887 "java/src/org/webrtc/ThreadUtils.java", | 898 "java/src/org/webrtc/ThreadUtils.java", | 
| 888 ] | 899 ] | 
| 889 } | 900 } | 
| 890 } | 901 } | 
| OLD | NEW |