Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

707 lines
22 KiB
Plaintext
Raw Normal View History

# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# 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")
group("android") {
if (!build_with_chromium && is_android) {
public_deps = [
":libjingle_peerconnection_datachannelonly_so",
":libjingle_peerconnection_jni",
":libjingle_peerconnection_so",
":libwebrtc",
]
}
}
config("libjingle_peerconnection_jni_warnings_config") {
# The warnings below are enabled by default. Since GN orders compiler flags
# for a target before flags from configs, the only way to disable such
# warnings is by having them in a separate config, loaded from the target.
if (!is_win) {
cflags = [
"-Wno-sign-compare",
"-Wno-unused-variable",
]
}
}
generate_jni("generated_base_jni") {
sources = [
"src/java/org/webrtc/WebRtcClassLoader.java",
]
jni_package = ""
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
generate_jar_jni("generated_external_classes_jni") {
Reland "Android: Generate JNI code for stats" This reverts commit 43d069a2cdb90ec8c887cf8aa68b42b7cf7ea49d. Reason for revert: Include fix for local reference overflow. Original change's description: > Revert "Android: Generate JNI code for stats" > > This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. > > Reason for revert: Causes error: > JNI ERROR (app bug): local reference table overflow (max=512)' > > Original change's description: > > Android: Generate JNI code for stats > > > > This CL also unifies the functions for converting from C++ to Java, and > > generates the boiler plate for converting C++ vectors to Java arrays. > > > > Bug: webrtc:8278 > > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > > Reviewed-on: https://webrtc-review.googlesource.com/26020 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20918} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278 > Reviewed-on: https://webrtc-review.googlesource.com/26900 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20926} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6f7097f308098e7922fbf0bed577bd69da4e1c61 Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26901 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20951}
2017-11-29 19:27:06 +01:00
classes = [
"java/lang/Integer.class",
"java/lang/Double.class",
"java/lang/Long.class",
"java/lang/Iterable.class",
"java/util/Iterator.class",
Reland "Android: Generate JNI code for stats" This reverts commit 43d069a2cdb90ec8c887cf8aa68b42b7cf7ea49d. Reason for revert: Include fix for local reference overflow. Original change's description: > Revert "Android: Generate JNI code for stats" > > This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. > > Reason for revert: Causes error: > JNI ERROR (app bug): local reference table overflow (max=512)' > > Original change's description: > > Android: Generate JNI code for stats > > > > This CL also unifies the functions for converting from C++ to Java, and > > generates the boiler plate for converting C++ vectors to Java arrays. > > > > Bug: webrtc:8278 > > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > > Reviewed-on: https://webrtc-review.googlesource.com/26020 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20918} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278 > Reviewed-on: https://webrtc-review.googlesource.com/26900 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20926} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6f7097f308098e7922fbf0bed577bd69da4e1c61 Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26901 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20951}
2017-11-29 19:27:06 +01:00
"java/lang/Boolean.class",
"java/math/BigInteger.class",
"java/util/Map.class",
"java/util/LinkedHashMap.class",
"java/util/ArrayList.class",
"java/lang/Enum.class",
Reland "Android: Generate JNI code for stats" This reverts commit 43d069a2cdb90ec8c887cf8aa68b42b7cf7ea49d. Reason for revert: Include fix for local reference overflow. Original change's description: > Revert "Android: Generate JNI code for stats" > > This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. > > Reason for revert: Causes error: > JNI ERROR (app bug): local reference table overflow (max=512)' > > Original change's description: > > Android: Generate JNI code for stats > > > > This CL also unifies the functions for converting from C++ to Java, and > > generates the boiler plate for converting C++ vectors to Java arrays. > > > > Bug: webrtc:8278 > > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > > Reviewed-on: https://webrtc-review.googlesource.com/26020 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20918} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278 > Reviewed-on: https://webrtc-review.googlesource.com/26900 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20926} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6f7097f308098e7922fbf0bed577bd69da4e1c61 Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26901 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20951}
2017-11-29 19:27:06 +01:00
]
jni_package = ""
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
rtc_source_set("base_jni") {
sources = [
"src/jni/androidhistogram_jni.cc",
"src/jni/class_loader.cc",
"src/jni/class_loader.h",
"src/jni/classreferenceholder.cc",
"src/jni/classreferenceholder.h",
"src/jni/jni_common.cc",
"src/jni/jni_generator_helper.cc",
"src/jni/jni_generator_helper.h",
"src/jni/jni_helpers.cc",
"src/jni/jni_helpers.h",
"src/jni/pc/audio_jni.h",
"src/jni/pc/media_jni.h",
"src/jni/pc/video_jni.h",
]
deps = [
":generated_base_jni",
":generated_external_classes_jni",
"../../api:libjingle_peerconnection_api",
"../../api:optional",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics_api",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
"//build/config/clang:extra_warnings",
"//build/config/clang:find_bad_constructs",
]
}
}
rtc_static_library("audio_jni") {
sources = [
"src/jni/pc/audio_jni.cc",
"src/jni/pc/defaultaudioprocessingfactory_jni.cc",
]
deps = [
":base_jni",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory",
"../../modules/audio_processing:audio_processing",
"../../rtc_base:rtc_base_approved",
"../../voice_engine:voice_engine",
]
}
rtc_static_library("null_audio_jni") {
sources = [
"src/jni/pc/null_audio_jni.cc",
]
deps = [
":base_jni",
]
}
generate_jni("generated_video_jni") {
sources = [
"api/org/webrtc/EncodedImage.java",
"api/org/webrtc/MediaCodecVideoDecoder.java",
"api/org/webrtc/MediaCodecVideoEncoder.java",
"api/org/webrtc/SurfaceTextureHelper.java",
"api/org/webrtc/VideoCodecStatus.java",
"api/org/webrtc/VideoDecoder.java",
"api/org/webrtc/VideoEncoder.java",
"api/org/webrtc/VideoEncoderFactory.java",
"api/org/webrtc/VideoFrame.java",
"api/org/webrtc/VideoSink.java",
"src/java/org/webrtc/VideoDecoderWrapper.java",
"src/java/org/webrtc/VideoEncoderWrapper.java",
"src/java/org/webrtc/WrappedNativeVideoDecoder.java",
"src/java/org/webrtc/WrappedNativeVideoEncoder.java",
]
jni_package = ""
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
rtc_static_library("video_jni") {
sources = [
"src/jni/androidmediacodeccommon.h",
"src/jni/androidmediadecoder_jni.cc",
"src/jni/androidmediadecoder_jni.h",
"src/jni/androidmediaencoder_jni.cc",
"src/jni/androidmediaencoder_jni.h",
"src/jni/androidvideotracksource.cc",
"src/jni/androidvideotracksource.h",
"src/jni/androidvideotracksource_jni.cc",
"src/jni/encodedimage.cc",
"src/jni/encodedimage.h",
"src/jni/hardwarevideoencoderfactory.cc",
"src/jni/jni_generator_helper.h",
"src/jni/nv12buffer_jni.cc",
"src/jni/nv21buffer_jni.cc",
"src/jni/pc/video_jni.cc",
"src/jni/surfacetexturehelper_jni.cc",
"src/jni/surfacetexturehelper_jni.h",
"src/jni/video_renderer_jni.cc",
"src/jni/videocodecinfo.cc",
"src/jni/videocodecinfo.h",
"src/jni/videocodecstatus.cc",
"src/jni/videocodecstatus.h",
Reland C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces. This reverts commit 37a23504980bbd06fa9b1709357ce6a33afada30. Reason for revert: Fix compilation error on release builds. Original change's description: > Revert "C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces." > > This reverts commit ef4342f21ba9448138fc7d22482f3210cb20fd7e. > > Reason for revert: Breaks chromium.webrtc.fyi > > Original change's description: > > C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces. > > > > Bug: webrtc:7760 > > Change-Id: I136aff9bcfb9244bb45ec552b5443f4a06b87c27 > > Reviewed-on: https://chromium-review.googlesource.com/535475 > > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#18773} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45810b9f3573074bb52539aa63843d59865c02f2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7760 > Reviewed-on: https://chromium-review.googlesource.com/549337 > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#18776} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: Id38836a1cb63ff265af6562a0512818acb8afb0a Bug: webrtc:7760 Reviewed-on: https://chromium-review.googlesource.com/549338 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18777}
2017-06-27 10:03:49 +02:00
"src/jni/videodecoderfactorywrapper.cc",
"src/jni/videodecoderfactorywrapper.h",
"src/jni/videodecoderfallback.cc",
Reland C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces. This reverts commit 37a23504980bbd06fa9b1709357ce6a33afada30. Reason for revert: Fix compilation error on release builds. Original change's description: > Revert "C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces." > > This reverts commit ef4342f21ba9448138fc7d22482f3210cb20fd7e. > > Reason for revert: Breaks chromium.webrtc.fyi > > Original change's description: > > C++ wrapper for VideoDecoder and VideoDecoderFactory interfaces. > > > > Bug: webrtc:7760 > > Change-Id: I136aff9bcfb9244bb45ec552b5443f4a06b87c27 > > Reviewed-on: https://chromium-review.googlesource.com/535475 > > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#18773} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45810b9f3573074bb52539aa63843d59865c02f2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7760 > Reviewed-on: https://chromium-review.googlesource.com/549337 > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#18776} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: Id38836a1cb63ff265af6562a0512818acb8afb0a Bug: webrtc:7760 Reviewed-on: https://chromium-review.googlesource.com/549338 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18777}
2017-06-27 10:03:49 +02:00
"src/jni/videodecoderwrapper.cc",
"src/jni/videodecoderwrapper.h",
"src/jni/videoencoderfactorywrapper.cc",
"src/jni/videoencoderfactorywrapper.h",
"src/jni/videoencoderfallback.cc",
"src/jni/videoencoderwrapper.cc",
"src/jni/videoencoderwrapper.h",
"src/jni/videofilerenderer_jni.cc",
"src/jni/videoframe.cc",
"src/jni/videoframe.h",
"src/jni/videotrack_jni.cc",
"src/jni/vp8codec.cc",
"src/jni/vp9codec.cc",
"src/jni/wrapped_native_i420_buffer.cc",
"src/jni/wrapped_native_i420_buffer.h",
"src/jni/wrappednativecodec.cc",
"src/jni/wrappednativecodec.h",
"src/jni/yuvhelper.cc",
]
configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
"//build/config/clang:extra_warnings",
"//build/config/clang:find_bad_constructs",
]
}
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
if (is_win) {
cflags += [
"/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch.
"/wd4389", # signed/unsigned mismatch.
]
}
deps = [
":base_jni",
":generated_video_jni",
":peerconnection_jni",
"$rtc_libyuv_dir",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:video_frame_api",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
"../../media:rtc_audio_video",
"../../media:rtc_media_base",
"../../modules:module_api",
"../../modules/utility:utility",
"../../modules/video_coding:codec_globals_headers",
"../../modules/video_coding:video_coding_utility",
"../../modules/video_coding:webrtc_vp8",
"../../modules/video_coding:webrtc_vp9",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../rtc_base:weak_ptr",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
]
}
rtc_static_library("null_video_jni") {
sources = [
"src/jni/pc/null_video_jni.cc",
]
deps = [
":base_jni",
]
}
rtc_static_library("media_jni") {
sources = [
"src/jni/pc/media_jni.cc",
]
deps = [
":base_jni",
"../../api/video_codecs:video_codecs_api",
"../../call:call_interfaces",
"../../logging:rtc_event_log_api",
"../../media:rtc_audio_video",
"../../modules/audio_device:audio_device",
"../../modules/audio_processing:audio_processing",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
"//build/config/clang:extra_warnings",
"//build/config/clang:find_bad_constructs",
]
}
}
rtc_static_library("null_media_jni") {
sources = [
"src/jni/pc/null_media_jni.cc",
]
deps = [
":base_jni",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
"//build/config/clang:extra_warnings",
"//build/config/clang:find_bad_constructs",
]
}
}
Reland "Android: Generate JNI code for androidnetworkmonitor_jni" This reverts commit 522c1bc6bb945d66bf77f175da48e1644d74511e. Reason for revert: Reland with a temporary fix. Original change's description: > Revert "Android: Generate JNI code for androidnetworkmonitor_jni" > > This reverts commit 768e1c0ea1f2077675df31915132a0557aca400e. > > Reason for revert: Breaks AppRTCMobile. > > Original change's description: > > Android: Generate JNI code for androidnetworkmonitor_jni > > > > Bug: webrtc:8278 > > Change-Id: I8447b2de5ec2610760f7112b6f86e54d94325322 > > Reviewed-on: https://webrtc-review.googlesource.com/24520 > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20796} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45f8d19abd81386872b7c095ac7eca21fa06077c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278,webrtc:8556 > Reviewed-on: https://webrtc-review.googlesource.com/24622 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20800} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I7cc404993addb17f0397127a10aac67476ef6ff4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8278, webrtc:8556 Reviewed-on: https://webrtc-review.googlesource.com/24623 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20801}
2017-11-20 21:55:27 +01:00
generate_jni("generated_peerconnection_jni") {
sources = [
"api/org/webrtc/DataChannel.java",
"api/org/webrtc/IceCandidate.java",
"api/org/webrtc/MediaConstraints.java",
"api/org/webrtc/MediaStream.java",
"api/org/webrtc/MediaStreamTrack.java",
Reland "Android: Generate JNI code for androidnetworkmonitor_jni" This reverts commit 522c1bc6bb945d66bf77f175da48e1644d74511e. Reason for revert: Reland with a temporary fix. Original change's description: > Revert "Android: Generate JNI code for androidnetworkmonitor_jni" > > This reverts commit 768e1c0ea1f2077675df31915132a0557aca400e. > > Reason for revert: Breaks AppRTCMobile. > > Original change's description: > > Android: Generate JNI code for androidnetworkmonitor_jni > > > > Bug: webrtc:8278 > > Change-Id: I8447b2de5ec2610760f7112b6f86e54d94325322 > > Reviewed-on: https://webrtc-review.googlesource.com/24520 > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20796} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45f8d19abd81386872b7c095ac7eca21fa06077c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278,webrtc:8556 > Reviewed-on: https://webrtc-review.googlesource.com/24622 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20800} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I7cc404993addb17f0397127a10aac67476ef6ff4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8278, webrtc:8556 Reviewed-on: https://webrtc-review.googlesource.com/24623 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20801}
2017-11-20 21:55:27 +01:00
"api/org/webrtc/NetworkMonitor.java",
"api/org/webrtc/NetworkMonitorAutoDetect.java",
"api/org/webrtc/PeerConnection.java",
"api/org/webrtc/RTCStats.java",
"api/org/webrtc/RTCStatsCollectorCallback.java",
"api/org/webrtc/RTCStatsReport.java",
"api/org/webrtc/RtpReceiver.java",
"api/org/webrtc/RtpSender.java",
Reland "Android: Generate JNI code for stats" This reverts commit 43d069a2cdb90ec8c887cf8aa68b42b7cf7ea49d. Reason for revert: Include fix for local reference overflow. Original change's description: > Revert "Android: Generate JNI code for stats" > > This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. > > Reason for revert: Causes error: > JNI ERROR (app bug): local reference table overflow (max=512)' > > Original change's description: > > Android: Generate JNI code for stats > > > > This CL also unifies the functions for converting from C++ to Java, and > > generates the boiler plate for converting C++ vectors to Java arrays. > > > > Bug: webrtc:8278 > > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > > Reviewed-on: https://webrtc-review.googlesource.com/26020 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20918} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278 > Reviewed-on: https://webrtc-review.googlesource.com/26900 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20926} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6f7097f308098e7922fbf0bed577bd69da4e1c61 Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26901 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20951}
2017-11-29 19:27:06 +01:00
"api/org/webrtc/StatsObserver.java",
"api/org/webrtc/StatsReport.java",
Reland "Android: Generate JNI code for androidnetworkmonitor_jni" This reverts commit 522c1bc6bb945d66bf77f175da48e1644d74511e. Reason for revert: Reland with a temporary fix. Original change's description: > Revert "Android: Generate JNI code for androidnetworkmonitor_jni" > > This reverts commit 768e1c0ea1f2077675df31915132a0557aca400e. > > Reason for revert: Breaks AppRTCMobile. > > Original change's description: > > Android: Generate JNI code for androidnetworkmonitor_jni > > > > Bug: webrtc:8278 > > Change-Id: I8447b2de5ec2610760f7112b6f86e54d94325322 > > Reviewed-on: https://webrtc-review.googlesource.com/24520 > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20796} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45f8d19abd81386872b7c095ac7eca21fa06077c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278,webrtc:8556 > Reviewed-on: https://webrtc-review.googlesource.com/24622 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20800} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I7cc404993addb17f0397127a10aac67476ef6ff4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8278, webrtc:8556 Reviewed-on: https://webrtc-review.googlesource.com/24623 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20801}
2017-11-20 21:55:27 +01:00
]
jni_package = ""
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
rtc_static_library("peerconnection_jni") {
sources = [
Revert of Break peerconnection_jni.cc into multiple files, in "pc" directory. (patchset #6 id:100001 of https://codereview.webrtc.org/2992103002/ ) Reason for revert: Borken in the internal projects. Original issue's description: > Break peerconnection_jni.cc into multiple files, in "pc" directory. > > This CL breaks peerconnection_jni.cc apart, into one file for each > class. It also moves the methods for converting between C++/Java > structs into "java_native_conversion.cc", and uses a consistent naming > scheme ("JavaToNativeX, NativeToJavaX"). These files go into a new > "pc" directory, of which deadbeef@ is added as an owner. > > It also moves some relevant files to the "pc" directory that belong > there: ownedfactoryandthreads, androidnetworkmonitor_jni, and > rtcstatscollectorcallbackwrapper. This directory is intended to hold > all the files that deal with the PeerConnection API specifically, or > related classes (like DataChannel, RtpSender, MediaStreamTrack) that > are tied to it closely. > > deadbeef@webrtc.org is added as an owner of the new "pc" subdirectory. > > BUG=webrtc:8055 > > Review-Url: https://codereview.webrtc.org/2992103002 > Cr-Commit-Position: refs/heads/master@{#19223} > Committed: https://chromium.googlesource.com/external/webrtc/+/dd7d8f1b609d51bcf39e9585871967a694a856bb TBR=magjed@webrtc.org,sakal@webrtc.org,deadbeef@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:8055 Review-Url: https://codereview.webrtc.org/2989323002 Cr-Commit-Position: refs/heads/master@{#19226}
2017-08-02 18:01:05 -07:00
"src/jni/androidnetworkmonitor_jni.h",
"src/jni/pc/androidnetworkmonitor_jni.cc",
"src/jni/pc/androidnetworkmonitor_jni.h",
"src/jni/pc/audiotrack_jni.cc",
"src/jni/pc/callsessionfilerotatinglogsink_jni.cc",
"src/jni/pc/datachannel.cc",
"src/jni/pc/datachannel.h",
"src/jni/pc/dtmfsender_jni.cc",
"src/jni/pc/java_native_conversion.cc",
"src/jni/pc/java_native_conversion.h",
"src/jni/pc/logging_jni.cc",
"src/jni/pc/mediaconstraints_jni.cc",
"src/jni/pc/mediaconstraints_jni.h",
"src/jni/pc/mediasource_jni.cc",
"src/jni/pc/mediastream_jni.cc",
"src/jni/pc/mediastreamtrack_jni.cc",
"src/jni/pc/ownedfactoryandthreads.cc",
"src/jni/pc/ownedfactoryandthreads.h",
"src/jni/pc/peerconnection.cc",
"src/jni/pc/peerconnection.h",
"src/jni/pc/peerconnectionfactory_jni.cc",
"src/jni/pc/rtcstatscollectorcallbackwrapper.cc",
"src/jni/pc/rtcstatscollectorcallbackwrapper.h",
"src/jni/pc/rtpreceiver.cc",
"src/jni/pc/rtpreceiver.h",
"src/jni/pc/rtpsender_jni.cc",
"src/jni/pc/sdpobserver_jni.h",
"src/jni/pc/statsobserver_jni.cc",
"src/jni/pc/statsobserver_jni.h",
"src/jni/pc/turncustomizer_jni.cc",
]
configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
"//build/config/clang:extra_warnings",
"//build/config/clang:find_bad_constructs",
]
}
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
if (is_win) {
cflags += [
"/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch.
"/wd4389", # signed/unsigned mismatch.
]
}
deps = [
":base_jni",
Reland "Android: Generate JNI code for stats" This reverts commit 43d069a2cdb90ec8c887cf8aa68b42b7cf7ea49d. Reason for revert: Include fix for local reference overflow. Original change's description: > Revert "Android: Generate JNI code for stats" > > This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. > > Reason for revert: Causes error: > JNI ERROR (app bug): local reference table overflow (max=512)' > > Original change's description: > > Android: Generate JNI code for stats > > > > This CL also unifies the functions for converting from C++ to Java, and > > generates the boiler plate for converting C++ vectors to Java arrays. > > > > Bug: webrtc:8278 > > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > > Reviewed-on: https://webrtc-review.googlesource.com/26020 > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20918} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278 > Reviewed-on: https://webrtc-review.googlesource.com/26900 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20926} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6f7097f308098e7922fbf0bed577bd69da4e1c61 Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26901 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20951}
2017-11-29 19:27:06 +01:00
":generated_external_classes_jni",
Reland "Android: Generate JNI code for androidnetworkmonitor_jni" This reverts commit 522c1bc6bb945d66bf77f175da48e1644d74511e. Reason for revert: Reland with a temporary fix. Original change's description: > Revert "Android: Generate JNI code for androidnetworkmonitor_jni" > > This reverts commit 768e1c0ea1f2077675df31915132a0557aca400e. > > Reason for revert: Breaks AppRTCMobile. > > Original change's description: > > Android: Generate JNI code for androidnetworkmonitor_jni > > > > Bug: webrtc:8278 > > Change-Id: I8447b2de5ec2610760f7112b6f86e54d94325322 > > Reviewed-on: https://webrtc-review.googlesource.com/24520 > > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20796} > > TBR=magjed@webrtc.org,sakal@webrtc.org > > Change-Id: I45f8d19abd81386872b7c095ac7eca21fa06077c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8278,webrtc:8556 > Reviewed-on: https://webrtc-review.googlesource.com/24622 > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20800} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I7cc404993addb17f0397127a10aac67476ef6ff4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8278, webrtc:8556 Reviewed-on: https://webrtc-review.googlesource.com/24623 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20801}
2017-11-20 21:55:27 +01:00
":generated_peerconnection_jni",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:peerconnection_and_implicit_call_api",
"../../api/video_codecs:video_codecs_api",
"../../media:rtc_data",
"../../media:rtc_media_base",
"../../modules/audio_device:audio_device",
"../../modules/utility:utility",
"../../pc:peerconnection",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers:field_trial_api",
]
}
rtc_static_library("libjingle_peerconnection_jni") {
public_deps = [
":audio_jni",
":base_jni",
":media_jni",
":peerconnection_jni",
":video_jni",
"../../pc:create_pc_factory",
]
}
generate_jni("generated_metrics_jni") {
sources = [
"api/org/webrtc/Metrics.java",
]
jni_package = ""
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
sources = [
"src/jni/androidmetrics_jni.cc",
]
configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
deps = [
":base_jni",
":generated_metrics_jni",
":peerconnection_jni",
"../../pc:peerconnection",
"../../system_wrappers:field_trial_default",
"../../system_wrappers:metrics_api",
"../../system_wrappers:metrics_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") {
sources = [
"src/jni/jni_onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ]
deps = [
":base_jni",
":libjingle_peerconnection_metrics_default_jni",
":null_audio_jni",
":null_media_jni",
":null_video_jni",
":peerconnection_jni",
"../../pc:peerconnection",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
]
output_extension = "so"
}
rtc_shared_library("libjingle_peerconnection_so") {
sources = [
"src/jni/jni_onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ]
deps = [
":libjingle_peerconnection_jni",
":libjingle_peerconnection_metrics_default_jni",
"../../pc:libjingle_peerconnection",
"../../rtc_base:rtc_base",
]
output_extension = "so"
}
template("java8_dist_jar") {
_deps = []
_output_jars = []
foreach(dep, invoker.deps) {
_dep_name = get_label_info(dep, "name")
Roll chromium_revision 5d9089080e..fb396f70fd (522183:522378) Changes to java8_dist_jar unblock the roll. Change log: https://chromium.googlesource.com/chromium/src/+log/5d9089080e..fb396f70fd Full diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/ea8d608e8e..028bc777a2 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/379d3331d1..a487899ea8 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/7796ebdb5c..277bfb566d * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/50b6577a3d..7c055df753 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/caec3c432a..d8cd44fcb7 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/307c9f954d..db654910e3 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c98f4e3e61..a626dcf509 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/6fd3c7b6eb..4bd9152f8a DEPS diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd/DEPS No update to Clang. TBR=buildbot@webrtc.org, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: I0cae8d49c169f77c63ef85eb1ca9d4a5898bbbc4 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/30680 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21161}
2017-12-07 10:05:08 +01:00
_source_jar =
get_label_info(dep, "target_gen_dir") + "/" + _dep_name + ".javac.jar"
_output_jar = "$target_gen_dir/" + _dep_name + ".jar"
_copy_target_name = "${target_name}_${_dep_name}_copy"
copy(_copy_target_name) {
sources = [
_source_jar,
]
outputs = [
_output_jar,
]
deps = [
Roll chromium_revision 5d9089080e..fb396f70fd (522183:522378) Changes to java8_dist_jar unblock the roll. Change log: https://chromium.googlesource.com/chromium/src/+log/5d9089080e..fb396f70fd Full diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/ea8d608e8e..028bc777a2 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/379d3331d1..a487899ea8 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/7796ebdb5c..277bfb566d * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/50b6577a3d..7c055df753 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/caec3c432a..d8cd44fcb7 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/307c9f954d..db654910e3 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c98f4e3e61..a626dcf509 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/6fd3c7b6eb..4bd9152f8a DEPS diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd/DEPS No update to Clang. TBR=buildbot@webrtc.org, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: I0cae8d49c169f77c63ef85eb1ca9d4a5898bbbc4 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/30680 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21161}
2017-12-07 10:05:08 +01:00
dep,
]
}
_deps += [ ":" + _copy_target_name ]
_output_jars += [ _output_jar ]
}
action(target_name) {
forward_variables_from(invoker, [ "data" ])
script = "//build/android/gyp/create_dist_jar.py"
depfile = "$target_gen_dir/$target_name.d"
deps = _deps
outputs = [
invoker.output,
]
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
"--output",
rebase_path(invoker.output, root_build_dir),
]
foreach(output_jar, _output_jars) {
args += [
"--inputs",
rebase_path(output_jar, root_build_dir),
]
}
}
}
java8_dist_jar("libwebrtc") {
Reland of Creating libwebrtc bundle jar (patchset #1 id:1 of https://codereview.webrtc.org/2640023010/ ) Reason for revert: It seems that we cannot skip the generation of "//webrtc/base/base_java" in chromium without some refactoring because it is included as a dependency in some places. Original issue's description: > Revert of Creating libwebrtc bundle jar (patchset #4 id:60001 of https://codereview.webrtc.org/2646443002/ ) > > Reason for revert: > This breaks some chromium.webrtc.fyi buildbots with the following error: > > ERROR Unresolved dependencies. > //third_party/webrtc/base:base(//build/toolchain/android:android_arm) > needs //third_party/webrtc/base:base_java(//build/toolchain/android:android_arm) > > > Original issue's description: > > Creating libwebrtc bundle jar > > > > Creates a JAR which includes: > > - //webrtc/base:base_java > > - //webrtc/modules/audio_device:audio_device_java > > - //webrtc/sdk/android:libjingle_peerconnection_java > > - //webrtc/sdk/android:libjingle_peerconnection_metrics_default_java > > > > The libwebrtc.jar file will be generated at '<output_dir>/lib.java/webrtc/sdk/android/libwebrtc.jar'. > > > > BUG=webrtc:6356 > > > > Review-Url: https://codereview.webrtc.org/2646443002 > > Cr-Commit-Position: refs/heads/master@{#16189} > > Committed: https://chromium.googlesource.com/external/webrtc/+/a62a82b7e7da5a1bbbf8b5614ef19334cc1603ce > > TBR=kjellander@webrtc.org,sakal@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6356 > > Review-Url: https://codereview.webrtc.org/2640023010 > Cr-Commit-Position: refs/heads/master@{#16190} > Committed: https://chromium.googlesource.com/external/webrtc/+/3c9151b9532b372a35f0b81cc7c6b34d820506e1 TBR=kjellander@webrtc.org,sakal@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6356 Review-Url: https://codereview.webrtc.org/2646093004 Cr-Commit-Position: refs/heads/master@{#16203}
2017-01-23 01:25:53 -08:00
_target_dir_name = get_label_info(":$target_name", "dir")
output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar"
Reland of Creating libwebrtc bundle jar (patchset #1 id:1 of https://codereview.webrtc.org/2640023010/ ) Reason for revert: It seems that we cannot skip the generation of "//webrtc/base/base_java" in chromium without some refactoring because it is included as a dependency in some places. Original issue's description: > Revert of Creating libwebrtc bundle jar (patchset #4 id:60001 of https://codereview.webrtc.org/2646443002/ ) > > Reason for revert: > This breaks some chromium.webrtc.fyi buildbots with the following error: > > ERROR Unresolved dependencies. > //third_party/webrtc/base:base(//build/toolchain/android:android_arm) > needs //third_party/webrtc/base:base_java(//build/toolchain/android:android_arm) > > > Original issue's description: > > Creating libwebrtc bundle jar > > > > Creates a JAR which includes: > > - //webrtc/base:base_java > > - //webrtc/modules/audio_device:audio_device_java > > - //webrtc/sdk/android:libjingle_peerconnection_java > > - //webrtc/sdk/android:libjingle_peerconnection_metrics_default_java > > > > The libwebrtc.jar file will be generated at '<output_dir>/lib.java/webrtc/sdk/android/libwebrtc.jar'. > > > > BUG=webrtc:6356 > > > > Review-Url: https://codereview.webrtc.org/2646443002 > > Cr-Commit-Position: refs/heads/master@{#16189} > > Committed: https://chromium.googlesource.com/external/webrtc/+/a62a82b7e7da5a1bbbf8b5614ef19334cc1603ce > > TBR=kjellander@webrtc.org,sakal@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6356 > > Review-Url: https://codereview.webrtc.org/2640023010 > Cr-Commit-Position: refs/heads/master@{#16190} > Committed: https://chromium.googlesource.com/external/webrtc/+/3c9151b9532b372a35f0b81cc7c6b34d820506e1 TBR=kjellander@webrtc.org,sakal@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6356 Review-Url: https://codereview.webrtc.org/2646093004 Cr-Commit-Position: refs/heads/master@{#16203}
2017-01-23 01:25:53 -08:00
deps = [
":libjingle_peerconnection_java",
":libjingle_peerconnection_metrics_default_java",
"../../modules/audio_device:audio_device_java",
"../../rtc_base:base_java",
Reland of Creating libwebrtc bundle jar (patchset #1 id:1 of https://codereview.webrtc.org/2640023010/ ) Reason for revert: It seems that we cannot skip the generation of "//webrtc/base/base_java" in chromium without some refactoring because it is included as a dependency in some places. Original issue's description: > Revert of Creating libwebrtc bundle jar (patchset #4 id:60001 of https://codereview.webrtc.org/2646443002/ ) > > Reason for revert: > This breaks some chromium.webrtc.fyi buildbots with the following error: > > ERROR Unresolved dependencies. > //third_party/webrtc/base:base(//build/toolchain/android:android_arm) > needs //third_party/webrtc/base:base_java(//build/toolchain/android:android_arm) > > > Original issue's description: > > Creating libwebrtc bundle jar > > > > Creates a JAR which includes: > > - //webrtc/base:base_java > > - //webrtc/modules/audio_device:audio_device_java > > - //webrtc/sdk/android:libjingle_peerconnection_java > > - //webrtc/sdk/android:libjingle_peerconnection_metrics_default_java > > > > The libwebrtc.jar file will be generated at '<output_dir>/lib.java/webrtc/sdk/android/libwebrtc.jar'. > > > > BUG=webrtc:6356 > > > > Review-Url: https://codereview.webrtc.org/2646443002 > > Cr-Commit-Position: refs/heads/master@{#16189} > > Committed: https://chromium.googlesource.com/external/webrtc/+/a62a82b7e7da5a1bbbf8b5614ef19334cc1603ce > > TBR=kjellander@webrtc.org,sakal@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6356 > > Review-Url: https://codereview.webrtc.org/2640023010 > Cr-Commit-Position: refs/heads/master@{#16190} > Committed: https://chromium.googlesource.com/external/webrtc/+/3c9151b9532b372a35f0b81cc7c6b34d820506e1 TBR=kjellander@webrtc.org,sakal@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6356 Review-Url: https://codereview.webrtc.org/2646093004 Cr-Commit-Position: refs/heads/master@{#16203}
2017-01-23 01:25:53 -08:00
]
}
Reland: "Make javac warnings errors for WebRTC targets." This reverts commit 2bad72a27329ff30ceb9479253f5eb3d21888d25. Reason for revert: Fixing downstream projects (take 2). Original change's description: > Reland "Revert "Make javac warnings errors for WebRTC targets."" > > This is a reland of 098d24c3c18f4b1fd043d7ba716d7601f0ce2b74 > Original change's description: > > Revert "Make javac warnings errors for WebRTC targets." > > > > This reverts commit 19b761403c3522902d69d61179f4d184e3632f79. > > > > Reason for revert: Breaking internal builds > > > > Original change's description: > > > Make javac warnings errors for WebRTC targets. > > > > > > Adds new rtc_* templates for Android targets to allow specifying > > > default values that affect WebRTC targets. > > > > > > Bug: webrtc:6597 > > > Change-Id: Ie529bfc8500d1e785b8a59dba7078b5f88ccfcd1 > > > Reviewed-on: https://webrtc-review.googlesource.com/15103 > > > Reviewed-by: Patrik Höglund <phoglund@webrtc.org> > > > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#20567} > > > TBR=phoglund@webrtc.org,sakal@webrtc.org > > > > Change-Id: I6d3ff5604b3d4307765d3a65adb783f89fcc974c > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:6597 > > Reviewed-on: https://webrtc-review.googlesource.com/20740 > > Reviewed-by: Lu Liu <lliuu@webrtc.org> > > Commit-Queue: Lu Liu <lliuu@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20571} > > Bug: webrtc:6597 > Change-Id: Icfb5ded46ce76b674bae67bfa02054b4ec52bb0f > Reviewed-on: https://webrtc-review.googlesource.com/20800 > Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org> > Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20577} TBR=phoglund@webrtc.org,ehmaldonado@webrtc.org,mbonadei@webrtc.org,sakal@webrtc.org,lliuu@webrtc.org Change-Id: Id3713c1885318741711987ae642a269a9ca5bb85 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:6597 Reviewed-on: https://webrtc-review.googlesource.com/18441 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20588}
2017-11-07 15:36:33 +00:00
rtc_android_library("libjingle_peerconnection_java") {
java_files = [
"src/java/org/webrtc/VideoDecoderWrapper.java",
"api/org/webrtc/AudioProcessingFactory.java",
"api/org/webrtc/AudioSource.java",
"api/org/webrtc/AudioTrack.java",
"api/org/webrtc/CallSessionFileRotatingLogSink.java",
"api/org/webrtc/Camera1Capturer.java",
"api/org/webrtc/Camera1Enumerator.java",
"api/org/webrtc/Camera2Capturer.java",
"api/org/webrtc/Camera2Enumerator.java",
"api/org/webrtc/CameraEnumerationAndroid.java",
"api/org/webrtc/CameraEnumerator.java",
"api/org/webrtc/CameraVideoCapturer.java",
"api/org/webrtc/DataChannel.java",
"api/org/webrtc/DefaultAudioProcessingFactory.java",
"api/org/webrtc/DefaultVideoDecoderFactory.java",
"api/org/webrtc/DefaultVideoEncoderFactory.java",
"api/org/webrtc/DtmfSender.java",
"api/org/webrtc/EglBase.java",
"api/org/webrtc/EglRenderer.java",
"api/org/webrtc/EncodedImage.java",
"api/org/webrtc/FileVideoCapturer.java",
"api/org/webrtc/GlRectDrawer.java",
"api/org/webrtc/GlShader.java",
"api/org/webrtc/GlTextureFrameBuffer.java",
"api/org/webrtc/GlUtil.java",
"api/org/webrtc/HardwareVideoDecoderFactory.java",
"api/org/webrtc/HardwareVideoEncoderFactory.java",
"api/org/webrtc/IceCandidate.java",
"api/org/webrtc/JavaI420Buffer.java",
"api/org/webrtc/MediaCodecVideoDecoder.java",
"api/org/webrtc/MediaCodecVideoEncoder.java",
"api/org/webrtc/MediaConstraints.java",
"api/org/webrtc/MediaSource.java",
"api/org/webrtc/MediaStream.java",
"api/org/webrtc/MediaStreamTrack.java",
"api/org/webrtc/NativeLibraryLoader.java",
"api/org/webrtc/NetworkMonitor.java",
"api/org/webrtc/NetworkMonitorAutoDetect.java",
"api/org/webrtc/PeerConnection.java",
"api/org/webrtc/PeerConnectionFactory.java",
"api/org/webrtc/PostProcessingFactory.java",
"api/org/webrtc/RendererCommon.java",
"api/org/webrtc/RTCStats.java",
"api/org/webrtc/RTCStatsCollectorCallback.java",
"api/org/webrtc/RTCStatsReport.java",
"api/org/webrtc/RtpParameters.java",
"api/org/webrtc/RtpReceiver.java",
"api/org/webrtc/RtpSender.java",
"api/org/webrtc/ScreenCapturerAndroid.java",
"api/org/webrtc/SdpObserver.java",
"api/org/webrtc/SessionDescription.java",
"api/org/webrtc/SoftwareVideoDecoderFactory.java",
"api/org/webrtc/SoftwareVideoEncoderFactory.java",
"api/org/webrtc/StatsObserver.java",
"api/org/webrtc/StatsReport.java",
"api/org/webrtc/SurfaceTextureHelper.java",
"api/org/webrtc/SurfaceEglRenderer.java",
"api/org/webrtc/SurfaceViewRenderer.java",
"api/org/webrtc/TurnCustomizer.java",
"api/org/webrtc/VideoCapturer.java",
"api/org/webrtc/VideoCodecInfo.java",
"api/org/webrtc/VideoCodecStatus.java",
"api/org/webrtc/VideoDecoder.java",
"api/org/webrtc/VideoDecoderFactory.java",
"api/org/webrtc/VideoDecoderFallback.java",
"api/org/webrtc/VideoEncoder.java",
"api/org/webrtc/VideoEncoderFactory.java",
"api/org/webrtc/VideoEncoderFallback.java",
"api/org/webrtc/VideoFileRenderer.java",
"api/org/webrtc/VideoFrame.java",
"api/org/webrtc/VideoFrameDrawer.java",
"api/org/webrtc/VideoRenderer.java",
"api/org/webrtc/VideoSink.java",
"api/org/webrtc/VideoSource.java",
"api/org/webrtc/VideoTrack.java",
"api/org/webrtc/YuvConverter.java",
"api/org/webrtc/YuvHelper.java",
"src/java/org/webrtc/AndroidVideoTrackSourceObserver.java",
"src/java/org/webrtc/BaseBitrateAdjuster.java",
"src/java/org/webrtc/BitrateAdjuster.java",
"src/java/org/webrtc/CalledByNative.java",
"src/java/org/webrtc/CalledByNativeUnchecked.java",
"src/java/org/webrtc/Camera1Session.java",
"src/java/org/webrtc/Camera2Session.java",
"src/java/org/webrtc/CameraCapturer.java",
"src/java/org/webrtc/CameraSession.java",
"src/java/org/webrtc/WebRtcClassLoader.java",
"src/java/org/webrtc/DynamicBitrateAdjuster.java",
"src/java/org/webrtc/EglBase10.java",
"src/java/org/webrtc/EglBase14.java",
"src/java/org/webrtc/FramerateBitrateAdjuster.java",
"src/java/org/webrtc/HardwareVideoDecoder.java",
"src/java/org/webrtc/HardwareVideoEncoder.java",
"src/java/org/webrtc/Histogram.java",
"src/java/org/webrtc/JniCommon.java",
"src/java/org/webrtc/MediaCodecUtils.java",
"src/java/org/webrtc/NativeClassQualifiedName.java",
"src/java/org/webrtc/NativeLibrary.java",
"src/java/org/webrtc/NV12Buffer.java",
"src/java/org/webrtc/NV21Buffer.java",
"src/java/org/webrtc/TextureBufferImpl.java",
"src/java/org/webrtc/VideoCodecType.java",
"src/java/org/webrtc/VideoEncoderWrapper.java",
"src/java/org/webrtc/WrappedNativeI420Buffer.java",
"src/java/org/webrtc/WrappedNativeVideoEncoder.java",
"src/java/org/webrtc/WrappedNativeVideoDecoder.java",
"src/java/org/webrtc/VP8Encoder.java",
"src/java/org/webrtc/VP8Decoder.java",
"src/java/org/webrtc/VP9Encoder.java",
"src/java/org/webrtc/VP9Decoder.java",
]
deps = [
"../../modules/audio_device:audio_device_java",
"../../rtc_base:base_java",
]
}
Reland: "Make javac warnings errors for WebRTC targets." This reverts commit 2bad72a27329ff30ceb9479253f5eb3d21888d25. Reason for revert: Fixing downstream projects (take 2). Original change's description: > Reland "Revert "Make javac warnings errors for WebRTC targets."" > > This is a reland of 098d24c3c18f4b1fd043d7ba716d7601f0ce2b74 > Original change's description: > > Revert "Make javac warnings errors for WebRTC targets." > > > > This reverts commit 19b761403c3522902d69d61179f4d184e3632f79. > > > > Reason for revert: Breaking internal builds > > > > Original change's description: > > > Make javac warnings errors for WebRTC targets. > > > > > > Adds new rtc_* templates for Android targets to allow specifying > > > default values that affect WebRTC targets. > > > > > > Bug: webrtc:6597 > > > Change-Id: Ie529bfc8500d1e785b8a59dba7078b5f88ccfcd1 > > > Reviewed-on: https://webrtc-review.googlesource.com/15103 > > > Reviewed-by: Patrik Höglund <phoglund@webrtc.org> > > > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#20567} > > > TBR=phoglund@webrtc.org,sakal@webrtc.org > > > > Change-Id: I6d3ff5604b3d4307765d3a65adb783f89fcc974c > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:6597 > > Reviewed-on: https://webrtc-review.googlesource.com/20740 > > Reviewed-by: Lu Liu <lliuu@webrtc.org> > > Commit-Queue: Lu Liu <lliuu@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20571} > > Bug: webrtc:6597 > Change-Id: Icfb5ded46ce76b674bae67bfa02054b4ec52bb0f > Reviewed-on: https://webrtc-review.googlesource.com/20800 > Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org> > Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20577} TBR=phoglund@webrtc.org,ehmaldonado@webrtc.org,mbonadei@webrtc.org,sakal@webrtc.org,lliuu@webrtc.org Change-Id: Id3713c1885318741711987ae642a269a9ca5bb85 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:6597 Reviewed-on: https://webrtc-review.googlesource.com/18441 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20588}
2017-11-07 15:36:33 +00:00
rtc_android_library("libjingle_peerconnection_metrics_default_java") {
java_files = [ "api/org/webrtc/Metrics.java" ]
deps = [
":libjingle_peerconnection_java",
"../../rtc_base:base_java",
]
}
if (rtc_include_tests) {
Reland: "Make javac warnings errors for WebRTC targets." This reverts commit 2bad72a27329ff30ceb9479253f5eb3d21888d25. Reason for revert: Fixing downstream projects (take 2). Original change's description: > Reland "Revert "Make javac warnings errors for WebRTC targets."" > > This is a reland of 098d24c3c18f4b1fd043d7ba716d7601f0ce2b74 > Original change's description: > > Revert "Make javac warnings errors for WebRTC targets." > > > > This reverts commit 19b761403c3522902d69d61179f4d184e3632f79. > > > > Reason for revert: Breaking internal builds > > > > Original change's description: > > > Make javac warnings errors for WebRTC targets. > > > > > > Adds new rtc_* templates for Android targets to allow specifying > > > default values that affect WebRTC targets. > > > > > > Bug: webrtc:6597 > > > Change-Id: Ie529bfc8500d1e785b8a59dba7078b5f88ccfcd1 > > > Reviewed-on: https://webrtc-review.googlesource.com/15103 > > > Reviewed-by: Patrik Höglund <phoglund@webrtc.org> > > > Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#20567} > > > TBR=phoglund@webrtc.org,sakal@webrtc.org > > > > Change-Id: I6d3ff5604b3d4307765d3a65adb783f89fcc974c > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:6597 > > Reviewed-on: https://webrtc-review.googlesource.com/20740 > > Reviewed-by: Lu Liu <lliuu@webrtc.org> > > Commit-Queue: Lu Liu <lliuu@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20571} > > Bug: webrtc:6597 > Change-Id: Icfb5ded46ce76b674bae67bfa02054b4ec52bb0f > Reviewed-on: https://webrtc-review.googlesource.com/20800 > Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org> > Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20577} TBR=phoglund@webrtc.org,ehmaldonado@webrtc.org,mbonadei@webrtc.org,sakal@webrtc.org,lliuu@webrtc.org Change-Id: Id3713c1885318741711987ae642a269a9ca5bb85 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:6597 Reviewed-on: https://webrtc-review.googlesource.com/18441 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20588}
2017-11-07 15:36:33 +00:00
rtc_instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
apk_name = "libjingle_peerconnection_android_unittest"
android_manifest = "instrumentationtests/AndroidManifest.xml"
java_files = [
"instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java",
"instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java",
"instrumentationtests/src/org/webrtc/Camera2CapturerTest.java",
"instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java",
"instrumentationtests/src/org/webrtc/DefaultAudioProcessingFactoryTest.java",
"instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java",
"instrumentationtests/src/org/webrtc/EglRendererTest.java",
"instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java",
"instrumentationtests/src/org/webrtc/GlRectDrawerTest.java",
"instrumentationtests/src/org/webrtc/HardwareVideoDecoderTest.java",
"instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java",
"instrumentationtests/src/org/webrtc/MediaCodecVideoEncoderTest.java",
"instrumentationtests/src/org/webrtc/NetworkMonitorTest.java",
"instrumentationtests/src/org/webrtc/PeerConnectionFactoryTest.java",
"instrumentationtests/src/org/webrtc/PeerConnectionTest.java",
"instrumentationtests/src/org/webrtc/RendererCommonTest.java",
"instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java",
"instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java",
"instrumentationtests/src/org/webrtc/VideoFileRendererTest.java",
"instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java",
"instrumentationtests/src/org/webrtc/YuvHelperTest.java",
]
data = [
"../../sdk/android/instrumentationtests/src/org/webrtc/capturetestvideo.y4m",
]
deps = [
"../../rtc_base:base_java",
"../../sdk/android:libjingle_peerconnection_java",
"../../sdk/android:libjingle_peerconnection_metrics_default_java",
"//base:base_java",
"//base:base_java_test_support",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/junit",
]
shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ]
}
}