admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow using more jni targets on Linux

Browse Source 
Bug: None
Change-Id: Ied19f9eb399ef89d4f95028857efe77d3ee54693
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146214
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28618}
This commit is contained in:
Oleh Prypin 2019-07-19 14:51:12 +02:00 committed by Commit Bot
parent 1afe657d5c
commit ef3eda94a2
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/android/BUILD.gn
View File

@ -520,7 +520,9 @@ if (is_android) {
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
}
if (current_os == "linux" || is_android) {
################################
# JNI targets for Java modules #
################################
@ -840,9 +842,7 @@ if (is_android) {
":libvpx_vp9_jni",
]
}
}
if (current_os == "linux" || is_android) {
######################
# Native API targets #
######################
@ -879,9 +879,7 @@ if (current_os == "linux" || is_android) {
"//third_party/abseil-cpp/absl/types:optional",
]
}
}
if (is_android) {
rtc_static_library("native_api_base") {
visibility = [ "*" ]
sources = [
@ -1015,9 +1013,7 @@ if (is_android) {
"//rtc_base:base_java",
]
}
}
if (current_os == "linux" || is_android) {
# Internal code that is needed by native_api_jni. The code cannot be placed in
# base_jni because native_api_jni depends on the code (and base_jni depends on
# native_api_jni).
@ -1031,9 +1027,7 @@ if (current_os == "linux" || is_android) {
"../../rtc_base:checks",
]
}
}
if (is_android) {
rtc_static_library("videoframe_jni") {
sources = [
"src/jni/video_frame.cc",
@ -1171,9 +1165,7 @@ if (is_android) {
"//third_party/abseil-cpp/absl/types:optional",
]
}
}
if (current_os == "linux" || is_android) {
#########################
# Generated JNI targets #
#########################