zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow using base jni targets on Linux

Browse Source 
Change-Id: I227e0dc08b41dd944f0e4193ef68c03848ddcdaa
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145730
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28586}
This commit is contained in:
Oleh Prypin
2019-07-16 19:25:17 +02:00
committed by Commit Bot
parent 0182a0300f
commit 134aeeec27
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/android/BUILD.gn
View File

@ -840,7 +840,9 @@ if (is_android) {
":libvpx_vp9_jni", ":libvpx_vp9_jni",
] ]
} }
}
if (current_os == "linux" || is_android) {
###################### ######################
# Native API targets # # Native API targets #
###################### ######################
@ -877,7 +879,9 @@ if (is_android) {
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
}
if (is_android) {
rtc_static_library("native_api_base") { rtc_static_library("native_api_base") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
@ -1011,7 +1015,9 @@ if (is_android) {
"//rtc_base:base_java", "//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 # 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 # base_jni because native_api_jni depends on the code (and base_jni depends on
# native_api_jni). # native_api_jni).
@ -1025,7 +1031,9 @@ if (is_android) {
"../../rtc_base:checks", "../../rtc_base:checks",
] ]
} }
}
if (is_android) {
rtc_static_library("videoframe_jni") { rtc_static_library("videoframe_jni") {
sources = [ sources = [
"src/jni/video_frame.cc", "src/jni/video_frame.cc",
@ -1163,7 +1171,9 @@ if (is_android) {
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
}
if (current_os == "linux" || is_android) {
######################### #########################
# Generated JNI targets # # Generated JNI targets #
######################### #########################
@ -1344,7 +1354,9 @@ if (is_android) {
namespace = "webrtc::jni" namespace = "webrtc::jni"
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
} }
}
if (is_android) {
################ ################
# Test targets # # Test targets #
################ ################