OLD | NEW |
---|---|
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 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("//webrtc/webrtc.gni") | 9 import("//webrtc/webrtc.gni") |
10 import("//build/config/android/config.gni") | 10 import("//build/config/android/config.gni") |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 62 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
63 | 63 |
64 if (is_win) { | 64 if (is_win) { |
65 cflags += [ | 65 cflags += [ |
66 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. | 66 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. |
67 "/wd4389", # signed/unsigned mismatch. | 67 "/wd4389", # signed/unsigned mismatch. |
68 ] | 68 ] |
69 } | 69 } |
70 | 70 |
71 deps = [ | 71 deps = [ |
72 "../..:webrtc_common", | |
73 "../../api:video_frame_api", | |
74 "../../api/video_codecs:video_codecs_api", | |
75 "../../base:rtc_base", | |
76 "../../base:rtc_base_approved", | |
77 "../../base:rtc_task_queue", | |
78 "../../common_video:common_video", | |
79 "../../media:rtc_media", | |
80 "../../media:rtc_media_base", | |
81 "../../modules/utility:utility", | |
82 "../../modules/video_coding:video_coding_utility", | |
83 "../../system_wrappers:system_wrappers", | |
84 "../../voice_engine:voice_engine", | |
72 "//webrtc/pc:libjingle_peerconnection", | 85 "//webrtc/pc:libjingle_peerconnection", |
73 ] | 86 ] |
74 | 87 |
75 if (rtc_build_libyuv) { | 88 if (rtc_build_libyuv) { |
76 deps += [ "$rtc_libyuv_dir" ] | 89 deps += [ "$rtc_libyuv_dir" ] |
77 public_deps = [ | 90 public_deps = [ |
78 "$rtc_libyuv_dir", | 91 "$rtc_libyuv_dir", |
79 ] | 92 ] |
80 } else { | 93 } else { |
81 # Need to add a directory normally exported by libyuv. | 94 # Need to add a directory normally exported by libyuv. |
82 include_dirs = [ "$rtc_libyuv_dir/include" ] | 95 include_dirs = [ "$rtc_libyuv_dir/include" ] |
83 } | 96 } |
84 } | 97 } |
85 | 98 |
86 rtc_static_library("libjingle_peerconnection_metrics_default_jni") { | 99 rtc_static_library("libjingle_peerconnection_metrics_default_jni") { |
87 sources = [ | 100 sources = [ |
88 "src/jni/androidmetrics_jni.cc", | 101 "src/jni/androidmetrics_jni.cc", |
89 ] | 102 ] |
90 | 103 |
91 configs += [ ":libjingle_peerconnection_jni_warnings_config" ] | 104 configs += [ ":libjingle_peerconnection_jni_warnings_config" ] |
92 | 105 |
93 deps = [ | 106 deps = [ |
107 ":libjingle_peerconnection_jni", | |
108 "../../system_wrappers", | |
94 "//webrtc/pc:libjingle_peerconnection", | 109 "//webrtc/pc:libjingle_peerconnection", |
95 "//webrtc/system_wrappers:field_trial_default", | |
kjellander_webrtc
2017/04/19 13:41:33
This needs to stay, removed by accident? Even if t
mbonadei
2017/04/19 14:06:34
Yes, this is an error. Thanks.
| |
96 "//webrtc/system_wrappers:metrics_default", | 110 "//webrtc/system_wrappers:metrics_default", |
97 ] | 111 ] |
98 } | 112 } |
99 | 113 |
100 rtc_shared_library("libjingle_peerconnection_so") { | 114 rtc_shared_library("libjingle_peerconnection_so") { |
101 sources = [ | 115 sources = [ |
102 "src/jni/jni_onload.cc", | 116 "src/jni/jni_onload.cc", |
103 ] | 117 ] |
104 | 118 |
105 suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ] | 119 suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ] |
106 configs += [ "//build/config/android:hide_all_but_jni" ] | 120 configs += [ "//build/config/android:hide_all_but_jni" ] |
107 | 121 |
108 deps = [ | 122 deps = [ |
109 ":libjingle_peerconnection_jni", | 123 ":libjingle_peerconnection_jni", |
110 ":libjingle_peerconnection_metrics_default_jni", | 124 ":libjingle_peerconnection_metrics_default_jni", |
125 "../../base:rtc_base", | |
111 "//webrtc/pc:libjingle_peerconnection", | 126 "//webrtc/pc:libjingle_peerconnection", |
112 ] | 127 ] |
113 output_extension = "so" | 128 output_extension = "so" |
114 } | 129 } |
115 | 130 |
116 dist_jar("libwebrtc") { | 131 dist_jar("libwebrtc") { |
117 _target_dir_name = get_label_info(":$target_name", "dir") | 132 _target_dir_name = get_label_info(":$target_name", "dir") |
118 output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar" | 133 output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar" |
119 direct_deps_only = true | 134 direct_deps_only = true |
120 use_interface_jars = false | 135 use_interface_jars = false |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
236 "//third_party/android_support_test_runner:runner_java", | 251 "//third_party/android_support_test_runner:runner_java", |
237 "//third_party/junit", | 252 "//third_party/junit", |
238 "//webrtc/base:base_java", | 253 "//webrtc/base:base_java", |
239 "//webrtc/sdk/android:libjingle_peerconnection_java", | 254 "//webrtc/sdk/android:libjingle_peerconnection_java", |
240 "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", | 255 "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java", |
241 ] | 256 ] |
242 | 257 |
243 shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] | 258 shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ] |
244 } | 259 } |
245 } | 260 } |
OLD | NEW |