Add is_android
guard to all Android rule usages.
Android rules contain `assert is_android`. This didn't cause any problems only because GN doesn't touch files if they are not referenced from the root BUILD.gn file. Skipping presubmit because this CL triggers a warning even though it's just adding indentation. No-Presubmit: True Bug: None Change-Id: Ifcb8f0e1d47784ff800507f9d560c68e8f78c717 Reviewed-on: https://webrtc-review.googlesource.com/90040 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24061}
This commit is contained in:
@ -6,8 +6,10 @@
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import("//build/config/android/rules.gni")
|
||||
if (is_android) {
|
||||
import("//build/config/android/rules.gni")
|
||||
|
||||
android_java_prebuilt("autobanh_java") {
|
||||
android_java_prebuilt("autobanh_java") {
|
||||
jar_path = "lib/autobanh.jar"
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
import("//webrtc.gni")
|
||||
|
||||
rtc_android_apk("androidnativeapi") {
|
||||
if (is_android) {
|
||||
rtc_android_apk("androidnativeapi") {
|
||||
testonly = true
|
||||
apk_name = "androidnativeapi"
|
||||
android_manifest = "AndroidManifest.xml"
|
||||
@ -20,9 +21,9 @@ rtc_android_apk("androidnativeapi") {
|
||||
]
|
||||
|
||||
shared_libraries = [ ":examples_androidnativeapi_jni" ]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_jni") {
|
||||
generate_jni("generated_jni") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"java/org/webrtc/examples/androidnativeapi/CallClient.java",
|
||||
@ -30,9 +31,9 @@ generate_jni("generated_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc_examples"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_shared_library("examples_androidnativeapi_jni") {
|
||||
rtc_shared_library("examples_androidnativeapi_jni") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"jni/androidcallclient.cc",
|
||||
@ -64,10 +65,11 @@ rtc_shared_library("examples_androidnativeapi_jni") {
|
||||
"//system_wrappers:runtime_enabled_features_default",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
android_resources("resources") {
|
||||
android_resources("resources") {
|
||||
testonly = true
|
||||
resource_dirs = [ "res" ]
|
||||
custom_package = "org.webrtc.examples.androidnativeapi"
|
||||
}
|
||||
}
|
||||
|
@ -6,11 +6,12 @@
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import("../../webrtc.gni")
|
||||
import("//build/config/android/config.gni")
|
||||
import("//build/config/android/rules.gni")
|
||||
if (is_android) {
|
||||
import("../../webrtc.gni")
|
||||
import("//build/config/android/config.gni")
|
||||
import("//build/config/android/rules.gni")
|
||||
|
||||
group("android") {
|
||||
group("android") {
|
||||
if (!build_with_chromium && is_android) {
|
||||
public_deps = [
|
||||
":libjingle_peerconnection_datachannelonly_so",
|
||||
@ -20,9 +21,9 @@ group("android") {
|
||||
":native_api",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_base_jni") {
|
||||
generate_jni("generated_base_jni") {
|
||||
sources = [
|
||||
"api/org/webrtc/NetworkMonitor.java",
|
||||
"api/org/webrtc/NetworkMonitorAutoDetect.java",
|
||||
@ -32,9 +33,9 @@ generate_jni("generated_base_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
generate_jar_jni("generated_external_classes_jni") {
|
||||
generate_jar_jni("generated_external_classes_jni") {
|
||||
classes = [
|
||||
"java/lang/Integer.class",
|
||||
"java/lang/Double.class",
|
||||
@ -50,12 +51,12 @@ generate_jar_jni("generated_external_classes_jni") {
|
||||
]
|
||||
jni_package = ""
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
# 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).
|
||||
rtc_source_set("internal_jni") {
|
||||
# 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).
|
||||
rtc_source_set("internal_jni") {
|
||||
sources = [
|
||||
"src/jni/jvm.cc",
|
||||
"src/jni/jvm.h",
|
||||
@ -64,9 +65,9 @@ rtc_source_set("internal_jni") {
|
||||
deps = [
|
||||
"../../rtc_base:checks",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("base_jni") {
|
||||
rtc_source_set("base_jni") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"src/jni/androidhistogram.cc",
|
||||
@ -95,9 +96,9 @@ rtc_source_set("base_jni") {
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("audio_jni") {
|
||||
rtc_static_library("audio_jni") {
|
||||
sources = [
|
||||
"src/jni/pc/audio.cc",
|
||||
]
|
||||
@ -109,9 +110,9 @@ rtc_static_library("audio_jni") {
|
||||
"../../modules/audio_processing:audio_processing",
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("native_api_audio_device_module") {
|
||||
rtc_source_set("native_api_audio_device_module") {
|
||||
visibility = [ "*" ]
|
||||
|
||||
sources = [
|
||||
@ -133,9 +134,9 @@ rtc_source_set("native_api_audio_device_module") {
|
||||
if (rtc_enable_android_aaudio) {
|
||||
deps += [ ":aaudio_audio_device_module" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("audio_device_module_base") {
|
||||
rtc_source_set("audio_device_module_base") {
|
||||
visibility = [ "*" ]
|
||||
|
||||
sources = [
|
||||
@ -154,9 +155,9 @@ rtc_source_set("audio_device_module_base") {
|
||||
"../../system_wrappers:metrics_api",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (rtc_enable_android_aaudio) {
|
||||
if (rtc_enable_android_aaudio) {
|
||||
rtc_source_set("aaudio_audio_device_module") {
|
||||
visibility = [ "*" ]
|
||||
defines = [ "AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO" ]
|
||||
@ -182,9 +183,9 @@ if (rtc_enable_android_aaudio) {
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("opensles_audio_device_module") {
|
||||
rtc_source_set("opensles_audio_device_module") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"src/jni/audio_device/opensles_common.cc",
|
||||
@ -206,9 +207,9 @@ rtc_source_set("opensles_audio_device_module") {
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("java_audio_device_module") {
|
||||
rtc_source_set("java_audio_device_module") {
|
||||
visibility = [ "*" ]
|
||||
|
||||
sources = [
|
||||
@ -228,9 +229,9 @@ rtc_source_set("java_audio_device_module") {
|
||||
"../../system_wrappers:metrics_api",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("null_audio_jni") {
|
||||
rtc_static_library("null_audio_jni") {
|
||||
sources = [
|
||||
"src/jni/pc/null_audio.cc",
|
||||
]
|
||||
@ -238,18 +239,18 @@ rtc_static_library("null_audio_jni") {
|
||||
deps = [
|
||||
":base_jni",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_audio_device_module_base_jni") {
|
||||
generate_jni("generated_audio_device_module_base_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/audio/WebRtcAudioManager.java",
|
||||
]
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_java_audio_device_module_native_jni") {
|
||||
generate_jni("generated_java_audio_device_module_native_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/audio/WebRtcAudioRecord.java",
|
||||
"src/java/org/webrtc/audio/WebRtcAudioTrack.java",
|
||||
@ -257,9 +258,9 @@ generate_jni("generated_java_audio_device_module_native_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_video_jni") {
|
||||
generate_jni("generated_video_jni") {
|
||||
sources = [
|
||||
"api/org/webrtc/EncodedImage.java",
|
||||
"api/org/webrtc/MediaCodecVideoDecoder.java",
|
||||
@ -288,9 +289,9 @@ generate_jni("generated_video_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("video_jni") {
|
||||
rtc_static_library("video_jni") {
|
||||
sources = []
|
||||
deps = []
|
||||
|
||||
@ -364,9 +365,9 @@ rtc_static_library("video_jni") {
|
||||
"../../system_wrappers:field_trial_api",
|
||||
"//third_party/libyuv",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("videoframe_jni") {
|
||||
rtc_static_library("videoframe_jni") {
|
||||
sources = [
|
||||
"src/jni/videoframe.cc",
|
||||
"src/jni/videoframe.h",
|
||||
@ -386,9 +387,9 @@ rtc_static_library("videoframe_jni") {
|
||||
"../../rtc_base/memory:aligned_malloc",
|
||||
"//third_party/libyuv",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("null_video_jni") {
|
||||
rtc_static_library("null_video_jni") {
|
||||
sources = [
|
||||
"src/jni/pc/null_video.cc",
|
||||
]
|
||||
@ -397,9 +398,9 @@ rtc_static_library("null_video_jni") {
|
||||
":base_jni",
|
||||
"../../api/video_codecs:video_codecs_api",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_vp8_jni") {
|
||||
generate_jni("generated_vp8_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/VP8Decoder.java",
|
||||
"src/java/org/webrtc/VP8Encoder.java",
|
||||
@ -408,9 +409,9 @@ generate_jni("generated_vp8_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("vp8_jni") {
|
||||
rtc_static_library("vp8_jni") {
|
||||
sources = [
|
||||
"src/jni/vp8codec.cc",
|
||||
]
|
||||
@ -420,9 +421,9 @@ rtc_static_library("vp8_jni") {
|
||||
":generated_vp8_jni",
|
||||
"../../modules/video_coding:webrtc_vp8",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_vp9_jni") {
|
||||
generate_jni("generated_vp9_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/VP9Decoder.java",
|
||||
"src/java/org/webrtc/VP9Encoder.java",
|
||||
@ -431,9 +432,9 @@ generate_jni("generated_vp9_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("vp9_jni") {
|
||||
rtc_static_library("vp9_jni") {
|
||||
sources = [
|
||||
"src/jni/vp9codec.cc",
|
||||
]
|
||||
@ -443,9 +444,9 @@ rtc_static_library("vp9_jni") {
|
||||
":generated_vp9_jni",
|
||||
"../../modules/video_coding:webrtc_vp9",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("media_jni") {
|
||||
rtc_static_library("media_jni") {
|
||||
sources = [
|
||||
"src/jni/pc/media.cc",
|
||||
]
|
||||
@ -460,9 +461,9 @@ rtc_static_library("media_jni") {
|
||||
"../../modules/audio_device:audio_device",
|
||||
"../../modules/audio_processing:audio_processing",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("null_media_jni") {
|
||||
rtc_static_library("null_media_jni") {
|
||||
sources = [
|
||||
"src/jni/pc/null_media.cc",
|
||||
]
|
||||
@ -470,9 +471,9 @@ rtc_static_library("null_media_jni") {
|
||||
deps = [
|
||||
":base_jni",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_peerconnection_jni") {
|
||||
generate_jni("generated_peerconnection_jni") {
|
||||
sources = [
|
||||
"api/org/webrtc/AudioTrack.java",
|
||||
"api/org/webrtc/CallSessionFileRotatingLogSink.java",
|
||||
@ -502,26 +503,26 @@ generate_jni("generated_peerconnection_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("logging_java") {
|
||||
rtc_android_library("logging_java") {
|
||||
java_files = [ "src/java/org/webrtc/JNILogging.java" ]
|
||||
|
||||
deps = [
|
||||
":base_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_logging_jni") {
|
||||
generate_jni("generated_logging_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/JNILogging.java",
|
||||
]
|
||||
jni_package = ""
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("logging_jni") {
|
||||
rtc_static_library("logging_jni") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"src/jni/logging/logsink.cc",
|
||||
@ -534,9 +535,9 @@ rtc_static_library("logging_jni") {
|
||||
":native_api_jni",
|
||||
"../../rtc_base:rtc_base",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("peerconnection_jni") {
|
||||
rtc_static_library("peerconnection_jni") {
|
||||
# Do not depend on this target externally unless you absolute have to. It is
|
||||
# made public because we don't have a proper NDK yet. Header APIs here are not
|
||||
# considered public and are subject to change.
|
||||
@ -611,9 +612,9 @@ rtc_static_library("peerconnection_jni") {
|
||||
"../../system_wrappers:field_trial_api",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("libjingle_peerconnection_jni") {
|
||||
rtc_static_library("libjingle_peerconnection_jni") {
|
||||
visibility = [ "*" ]
|
||||
allow_poison = [
|
||||
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
||||
@ -628,18 +629,18 @@ rtc_static_library("libjingle_peerconnection_jni") {
|
||||
":video_jni",
|
||||
"../../pc:create_pc_factory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_metrics_jni") {
|
||||
generate_jni("generated_metrics_jni") {
|
||||
sources = [
|
||||
"api/org/webrtc/Metrics.java",
|
||||
]
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
|
||||
rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
|
||||
visibility = [ "*" ]
|
||||
|
||||
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
|
||||
@ -659,12 +660,12 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
|
||||
"../../system_wrappers:metrics_default",
|
||||
"../../system_wrappers:runtime_enabled_features_default",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# The modular build targets can be used to build WebRTC with different
|
||||
# functionalities. The users can choose either the real implemenation or the
|
||||
# null implementation of the audio/video modules based on their requirments.
|
||||
rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
|
||||
# The modular build targets can be used to build WebRTC with different
|
||||
# functionalities. The users can choose either the real implemenation or the
|
||||
# null implementation of the audio/video modules based on their requirments.
|
||||
rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
|
||||
sources = [
|
||||
"src/jni/jni_onload.cc",
|
||||
]
|
||||
@ -684,9 +685,9 @@ rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
]
|
||||
output_extension = "so"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_shared_library("libjingle_peerconnection_so") {
|
||||
rtc_shared_library("libjingle_peerconnection_so") {
|
||||
sources = [
|
||||
"src/jni/jni_onload.cc",
|
||||
]
|
||||
@ -701,9 +702,9 @@ rtc_shared_library("libjingle_peerconnection_so") {
|
||||
"../../rtc_base:rtc_base",
|
||||
]
|
||||
output_extension = "so"
|
||||
}
|
||||
}
|
||||
|
||||
dist_jar("libwebrtc") {
|
||||
dist_jar("libwebrtc") {
|
||||
_target_dir_name = get_label_info(":$target_name", "dir")
|
||||
output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar"
|
||||
direct_deps_only = true
|
||||
@ -731,10 +732,10 @@ dist_jar("libwebrtc") {
|
||||
"../../modules/audio_device:audio_device_java",
|
||||
"../../rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# TODO(sakal): Extract files from this target to releveant subtargets, video, audio etc.
|
||||
rtc_android_library("base_java") {
|
||||
# TODO(sakal): Extract files from this target to releveant subtargets, video, audio etc.
|
||||
rtc_android_library("base_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/RefCounted.java",
|
||||
"src/java/org/webrtc/CalledByNative.java",
|
||||
@ -749,9 +750,9 @@ rtc_android_library("base_java") {
|
||||
deps = [
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("video_api_java") {
|
||||
rtc_android_library("video_api_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/EncodedImage.java",
|
||||
"api/org/webrtc/VideoCapturer.java",
|
||||
@ -788,18 +789,18 @@ rtc_android_library("video_api_java") {
|
||||
":base_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("audio_api_java") {
|
||||
rtc_android_library("audio_api_java") {
|
||||
java_files = [ "api/org/webrtc/audio/AudioDeviceModule.java" ]
|
||||
|
||||
deps = [
|
||||
":base_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("java_audio_device_module_java") {
|
||||
rtc_android_library("java_audio_device_module_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/audio/JavaAudioDeviceModule.java",
|
||||
"src/java/org/webrtc/audio/VolumeLogger.java",
|
||||
@ -815,10 +816,10 @@ rtc_android_library("java_audio_device_module_java") {
|
||||
":base_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# JNI target for java_audio_device_module_java
|
||||
rtc_source_set("java_audio_device_module_jni") {
|
||||
# JNI target for java_audio_device_module_java
|
||||
rtc_source_set("java_audio_device_module_jni") {
|
||||
sources = [
|
||||
"src/jni/audio_device/java_audio_device_module.cc",
|
||||
]
|
||||
@ -828,18 +829,18 @@ rtc_source_set("java_audio_device_module_jni") {
|
||||
":generated_java_audio_jni",
|
||||
":java_audio_device_module",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_java_audio_jni") {
|
||||
generate_jni("generated_java_audio_jni") {
|
||||
sources = [
|
||||
"api/org/webrtc/audio/JavaAudioDeviceModule.java",
|
||||
]
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("video_java") {
|
||||
rtc_android_library("video_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/EglRenderer.java",
|
||||
"api/org/webrtc/GlRectDrawer.java",
|
||||
@ -859,9 +860,9 @@ rtc_android_library("video_java") {
|
||||
":video_api_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("camera_java") {
|
||||
rtc_android_library("camera_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/Camera1Capturer.java",
|
||||
"api/org/webrtc/Camera1Enumerator.java",
|
||||
@ -882,9 +883,9 @@ rtc_android_library("camera_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("screencapturer_java") {
|
||||
rtc_android_library("screencapturer_java") {
|
||||
java_files = [ "api/org/webrtc/ScreenCapturerAndroid.java" ]
|
||||
|
||||
deps = [
|
||||
@ -892,9 +893,9 @@ rtc_android_library("screencapturer_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("surfaceviewrenderer_java") {
|
||||
rtc_android_library("surfaceviewrenderer_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/SurfaceEglRenderer.java",
|
||||
"api/org/webrtc/SurfaceViewRenderer.java",
|
||||
@ -905,9 +906,9 @@ rtc_android_library("surfaceviewrenderer_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("filevideo_java") {
|
||||
rtc_android_library("filevideo_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/VideoFileRenderer.java",
|
||||
"api/org/webrtc/FileVideoCapturer.java",
|
||||
@ -919,9 +920,9 @@ rtc_android_library("filevideo_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("swcodecs_java") {
|
||||
rtc_android_library("swcodecs_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/SoftwareVideoDecoderFactory.java",
|
||||
"api/org/webrtc/SoftwareVideoEncoderFactory.java",
|
||||
@ -937,9 +938,9 @@ rtc_android_library("swcodecs_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("hwcodecs_java") {
|
||||
rtc_android_library("hwcodecs_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/HardwareVideoDecoderFactory.java",
|
||||
"api/org/webrtc/HardwareVideoEncoderFactory.java",
|
||||
@ -960,9 +961,9 @@ rtc_android_library("hwcodecs_java") {
|
||||
":video_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("peerconnection_java") {
|
||||
rtc_android_library("peerconnection_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/audio/LegacyAudioDeviceModule.java",
|
||||
"api/org/webrtc/AudioProcessingFactory.java",
|
||||
@ -1016,11 +1017,11 @@ rtc_android_library("peerconnection_java") {
|
||||
"//modules/audio_device:audio_device_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# Old target that pulls in everything. This will be going away in the future,
|
||||
# clients should depend on individual video_java etc. targets instead.
|
||||
rtc_android_library("libjingle_peerconnection_java") {
|
||||
# Old target that pulls in everything. This will be going away in the future,
|
||||
# clients should depend on individual video_java etc. targets instead.
|
||||
rtc_android_library("libjingle_peerconnection_java") {
|
||||
java_files = [ "src/java/org/webrtc/Empty.java" ]
|
||||
|
||||
deps = [
|
||||
@ -1038,9 +1039,9 @@ rtc_android_library("libjingle_peerconnection_java") {
|
||||
"//modules/audio_device:audio_device_java",
|
||||
"//rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("libjingle_peerconnection_metrics_default_java") {
|
||||
rtc_android_library("libjingle_peerconnection_metrics_default_java") {
|
||||
java_files = [ "api/org/webrtc/Metrics.java" ]
|
||||
|
||||
deps = [
|
||||
@ -1048,9 +1049,9 @@ rtc_android_library("libjingle_peerconnection_metrics_default_java") {
|
||||
":libjingle_peerconnection_java",
|
||||
"../../rtc_base:base_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("default_video_codec_factory_java") {
|
||||
rtc_android_library("default_video_codec_factory_java") {
|
||||
java_files = [
|
||||
"api/org/webrtc/DefaultVideoDecoderFactory.java",
|
||||
"api/org/webrtc/DefaultVideoEncoderFactory.java",
|
||||
@ -1062,9 +1063,9 @@ rtc_android_library("default_video_codec_factory_java") {
|
||||
":video_api_java",
|
||||
":video_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (rtc_include_tests) {
|
||||
if (rtc_include_tests) {
|
||||
rtc_instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
|
||||
apk_name = "libjingle_peerconnection_android_unittest"
|
||||
android_manifest = "instrumentationtests/AndroidManifest.xml"
|
||||
@ -1113,12 +1114,13 @@ if (rtc_include_tests) {
|
||||
"//third_party/junit",
|
||||
]
|
||||
|
||||
shared_libraries =
|
||||
[ "../../sdk/android:libjingle_peerconnection_instrumentationtests_so" ]
|
||||
shared_libraries = [
|
||||
"../../sdk/android:libjingle_peerconnection_instrumentationtests_so",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
rtc_shared_library("libjingle_peerconnection_instrumentationtests_so") {
|
||||
rtc_shared_library("libjingle_peerconnection_instrumentationtests_so") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"src/jni/jni_onload.cc",
|
||||
@ -1135,9 +1137,9 @@ rtc_shared_library("libjingle_peerconnection_instrumentationtests_so") {
|
||||
"../../rtc_base:rtc_base",
|
||||
]
|
||||
output_extension = "so"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("instrumentationtests_jni") {
|
||||
rtc_static_library("instrumentationtests_jni") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"instrumentationtests/loggable_test.cc",
|
||||
@ -1148,10 +1150,10 @@ rtc_static_library("instrumentationtests_jni") {
|
||||
":native_api_jni",
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# The native API is currently experimental and may change without notice.
|
||||
group("native_api") {
|
||||
# The native API is currently experimental and may change without notice.
|
||||
group("native_api") {
|
||||
deps = [
|
||||
":native_api_audio_device_module",
|
||||
":native_api_base",
|
||||
@ -1160,9 +1162,9 @@ group("native_api") {
|
||||
":native_api_peerconnection",
|
||||
":native_api_video",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_static_library("native_api_base") {
|
||||
rtc_static_library("native_api_base") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"native_api/base/init.cc",
|
||||
@ -1178,9 +1180,9 @@ rtc_static_library("native_api_base") {
|
||||
"//rtc_base:rtc_base",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_native_api_jni") {
|
||||
generate_jni("generated_native_api_jni") {
|
||||
sources = [
|
||||
"src/java/org/webrtc/JniHelper.java",
|
||||
"src/java/org/webrtc/WebRtcClassLoader.java",
|
||||
@ -1188,11 +1190,11 @@ generate_jni("generated_native_api_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
# JNI helpers that are also needed from internal JNI code. Cannot depend on any
|
||||
# other JNI targets than internal_jni.
|
||||
rtc_static_library("native_api_jni") {
|
||||
# JNI helpers that are also needed from internal JNI code. Cannot depend on any
|
||||
# other JNI targets than internal_jni.
|
||||
rtc_static_library("native_api_jni") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"native_api/jni/class_loader.cc",
|
||||
@ -1218,11 +1220,11 @@ rtc_static_library("native_api_jni") {
|
||||
"//rtc_base:rtc_base_approved",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# API for wrapping Java VideoDecoderFactory/VideoEncoderFactory classes to C++
|
||||
# objects.
|
||||
rtc_static_library("native_api_codecs") {
|
||||
# API for wrapping Java VideoDecoderFactory/VideoEncoderFactory classes to C++
|
||||
# objects.
|
||||
rtc_static_library("native_api_codecs") {
|
||||
visibility = [ "*" ]
|
||||
allow_poison = [
|
||||
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
||||
@ -1242,10 +1244,10 @@ rtc_static_library("native_api_codecs") {
|
||||
"//rtc_base:rtc_base_approved",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# API for creating Java PeerConnectionFactory from C++ equivalents.
|
||||
rtc_static_library("native_api_peerconnection") {
|
||||
# API for creating Java PeerConnectionFactory from C++ equivalents.
|
||||
rtc_static_library("native_api_peerconnection") {
|
||||
visibility = [ "*" ]
|
||||
|
||||
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
|
||||
@ -1262,11 +1264,11 @@ rtc_static_library("native_api_peerconnection") {
|
||||
"//api/video_codecs:video_codecs_api",
|
||||
"//rtc_base:rtc_base",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# API for creating C++ wrapper implementations of api/mediastreaminterface.h
|
||||
# video interfaces from their Java equivalents.
|
||||
rtc_static_library("native_api_video") {
|
||||
# API for creating C++ wrapper implementations of api/mediastreaminterface.h
|
||||
# video interfaces from their Java equivalents.
|
||||
rtc_static_library("native_api_video") {
|
||||
visibility = [ "*" ]
|
||||
allow_poison = [
|
||||
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
||||
@ -1287,9 +1289,9 @@ rtc_static_library("native_api_video") {
|
||||
"//rtc_base:rtc_base_approved",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
generate_jni("generated_native_unittests_jni") {
|
||||
generate_jni("generated_native_unittests_jni") {
|
||||
testonly = true
|
||||
|
||||
sources = [
|
||||
@ -1303,9 +1305,9 @@ generate_jni("generated_native_unittests_jni") {
|
||||
jni_package = ""
|
||||
namespace = "webrtc::jni"
|
||||
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
||||
}
|
||||
}
|
||||
|
||||
rtc_android_library("native_unittests_java") {
|
||||
rtc_android_library("native_unittests_java") {
|
||||
testonly = true
|
||||
|
||||
java_files = [
|
||||
@ -1321,9 +1323,9 @@ rtc_android_library("native_unittests_java") {
|
||||
":libjingle_peerconnection_java",
|
||||
"//third_party/android_support_test_runner:runner_java",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_source_set("native_unittests") {
|
||||
rtc_source_set("native_unittests") {
|
||||
testonly = true
|
||||
|
||||
sources = [
|
||||
@ -1379,4 +1381,5 @@ rtc_source_set("native_unittests") {
|
||||
"//testing/gtest",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user