98 lines
3.1 KiB
Plaintext
Raw Normal View History

# Copyright (c) 2020 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")
if (is_android) {
Roll chromium_revision 6ac7929166..eef62e8a0c (1190797:1197906) Change log: https://chromium.googlesource.com/chromium/src/+log/6ac7929166..eef62e8a0c Full diff: https://chromium.googlesource.com/chromium/src/+/6ac7929166..eef62e8a0c Changed dependencies * fuchsia_version: version:14.20230826.1.1..version:15.20230909.2.1 * reclient_version: re_client_version:0.113.0.8b45b89-gomaip..re_client_version:0.114.2.81e819b-gomaip * src/base: https://chromium.googlesource.com/chromium/src/base/+log/609cafa975..10140da63a * src/build: https://chromium.googlesource.com/chromium/src/build/+log/115a707991..c5658c73de * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/b2043d4f43..a567506e78 * src/buildtools/linux64: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * src/buildtools/mac: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * src/buildtools/reclient: re_client_version:0.113.0.8b45b89-gomaip..re_client_version:0.114.2.81e819b-gomaip * src/buildtools/win: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/17864bdc8f..91328c276e * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/ff8dee88bc..ac71f97e4a * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/ee6367daea..935018fd37 * src/third_party/android_build_tools/manifest_merger: kkbYOGsVRXhtxBiXuTufY0puTnG5QAfyxvFTBHFWL08C..FlwnxEZ1wdjoQfedkF4MiZgo8pD48-_CJNA7RnU6as4C * src/third_party/android_toolchain/ndk: R_8suM8m0oHbZ1awdxGXvKEFpAOETscbfZxkkMthyk8C..3vHltFqfgIw8wZ38ggGM9c7Eyw_AHZnwCgFIVtc9gngC * src/third_party/androidx: 2n47PFweHFzGxPWjh9RANTrGhmSDWowZ-YhkOV4j11MC..zIMLlRAldYvFj1UOOB-KZX_1YKfWx4vfYoCYVyF1XUsC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/b8e012e1ff..3aecf1d00b * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b8c4f2d99a..0dfa3b81d7 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/427f0f43ad..523537049c * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/dd1ced4ee3..d7b63a966b * src/third_party/kotlin_stdlib: 6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C..7XCiIAlSi36gvPwOn8N4Q1GE9sMLw6V1RljM9151cWIC * src/third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/84fb809dd6..7cee6b00d3 * src/third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/3d83ca7bd2..f6a17c88dd * src/third_party/libunwind/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/76e621a897..d9b4abf6b6 * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/24c0dcc851..6da1bd01d6 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/00427277dd..9a3ec114fc * src/third_party/r8: TBaeKaSTY2ttKx2JSFuWiQ8Na80KHZwLEgSAvT1DBJ0C..WptUn43oi_BkFPtEyZTdUD9wZo1yy8OPVqFwdP3jmqoC * src/third_party/turbine: ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C..laSnfZnTgkmZynERrjAlU3yeqB5rN446BctGmKQsZ64C * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/3e78ed797e..723bed483d * src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1 * src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1 DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ac7929166..eef62e8a0c/DEPS Clang version changed llvmorg-17-init-16420-g0c545a44:llvmorg-18-init-4631-gd50b56d1 Details: https://chromium.googlesource.com/chromium/src/+/6ac7929166..eef62e8a0c/tools/clang/scripts/update.py BUG=chromium:1481493,chromium:1483216,b/298960678 Change-Id: I934c827a71d332242ff182de08ba145c8eb8ec04 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/320680 Reviewed-by: Jeremy Leconte <jleconte@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/main@{#40767}
2023-09-19 10:09:06 +02:00
import("//third_party/jni_zero/jni_zero.gni")
rtc_android_apk("androidvoip") {
testonly = true
apk_name = "androidvoip"
android_manifest = "AndroidManifest.xml"
min_sdk_version = 21
target_sdk_version = 31
sources = [
"java/org/webrtc/examples/androidvoip/MainActivity.java",
"java/org/webrtc/examples/androidvoip/OnVoipClientTaskCompleted.java",
"java/org/webrtc/examples/androidvoip/VoipClient.java",
]
deps = [
":resources",
"//rtc_base:base_java",
"//sdk/android:base_java",
"//sdk/android:java_audio_device_module_java",
"//sdk/android:video_java",
"//third_party/androidx:androidx_core_core_java",
"//third_party/androidx:androidx_legacy_legacy_support_v4_java",
]
shared_libraries = [ ":examples_androidvoip_jni" ]
}
generate_jni("generated_jni") {
testonly = true
sources = [ "java/org/webrtc/examples/androidvoip/VoipClient.java" ]
namespace = "webrtc_examples"
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
}
rtc_shared_library("examples_androidvoip_jni") {
testonly = true
sources = [
"jni/android_voip_client.cc",
"jni/android_voip_client.h",
"jni/onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ]
deps = [
":generated_jni",
"../../api/audio:builtin_audio_processing_builder",
"../../rtc_base:async_packet_socket",
"../../rtc_base:async_udp_socket",
"../../rtc_base:logging",
"../../rtc_base:network",
Reland "Refactor rtc_base build targets." This is a reland of 69241a93fb14f6527a26d5c94dde879013012d2a Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5. The original CL didn't attach the definition of the macro NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have to be related to //rtc_base anymore but to //rtc_base:threading). Original change's description: > Refactor rtc_base build targets. > > The "//rtc_base:rtc_base" build target has historically been one of the > biggest targets in the WebRTC build. Big targets are the main source of > circular dependencies and non-API types leakage. > > This CL is a step forward into splitting "//rtc_base:rtc_base" into > smaller targets (as originally started in 2018). > > The only non-automated changes are (like re-wiring the build system): > * The creation of //rtc_base/async_resolver.{h,cc} which allows to > break a circular dependency (is has been extracted from > //rtc_base/net_helpers.{h,cc}). > * The creation of //rtc_base/internal/default_socket_server.{h,cc} to > break another circular dependency. > > Bug: webrtc:9987 > Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903 > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32941} Bug: webrtc:9987 Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33001}
2021-01-15 10:41:01 +01:00
"../../rtc_base:socket_address",
"../../rtc_base:socket_server",
"../../rtc_base:ssl_adapter",
Reland "Refactor rtc_base build targets." This is a reland of 69241a93fb14f6527a26d5c94dde879013012d2a Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5. The original CL didn't attach the definition of the macro NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have to be related to //rtc_base anymore but to //rtc_base:threading). Original change's description: > Refactor rtc_base build targets. > > The "//rtc_base:rtc_base" build target has historically been one of the > biggest targets in the WebRTC build. Big targets are the main source of > circular dependencies and non-API types leakage. > > This CL is a step forward into splitting "//rtc_base:rtc_base" into > smaller targets (as originally started in 2018). > > The only non-automated changes are (like re-wiring the build system): > * The creation of //rtc_base/async_resolver.{h,cc} which allows to > break a circular dependency (is has been extracted from > //rtc_base/net_helpers.{h,cc}). > * The creation of //rtc_base/internal/default_socket_server.{h,cc} to > break another circular dependency. > > Bug: webrtc:9987 > Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903 > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32941} Bug: webrtc:9987 Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33001}
2021-01-15 10:41:01 +01:00
"../../rtc_base:threading",
"//api:transport_api",
"//api/audio_codecs:audio_codecs_api",
"//api/audio_codecs:builtin_audio_decoder_factory",
"//api/audio_codecs:builtin_audio_encoder_factory",
"//api/task_queue:default_task_queue_factory",
"//api/units:time_delta",
"//api/voip:voip_api",
"//api/voip:voip_engine_factory",
"//rtc_base/network:received_packet",
"//sdk/android:native_api_audio_device_module",
"//sdk/android:native_api_base",
"//sdk/android:native_api_jni",
"//third_party/abseil-cpp/absl/memory:memory",
]
}
android_resources("resources") {
testonly = true
custom_package = "org.webrtc.examples.androidvoip"
sources = [
"res/layout/activity_main.xml",
"res/values/colors.xml",
"res/values/strings.xml",
]
# Needed for Bazel converter.
resource_dirs = [ "res" ]
assert(resource_dirs != []) # Mark as used.
}
}