mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
2e7ed0d615
Change log:6ac7929166..eef62e8a0cFull diff:6ac7929166..eef62e8a0cChanged 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:609cafa975..10140da63a* src/build:115a707991..c5658c73de* src/buildtools: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:17864bdc8f..91328c276e* src/testing:ff8dee88bc..ac71f97e4a* src/third_party: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:427f0f43ad..523537049c* src/third_party/freetype/src:dd1ced4ee3..d7b63a966b* src/third_party/kotlin_stdlib: 6cGkpHi3fSRhpRfq2b1mjmzfFmShvtQe6gy4g2nFQd0C..7XCiIAlSi36gvPwOn8N4Q1GE9sMLw6V1RljM9151cWIC * src/third_party/libc++/src:84fb809dd6..7cee6b00d3* src/third_party/libc++abi/src:3d83ca7bd2..f6a17c88dd* src/third_party/libunwind/src:76e621a897..d9b4abf6b6* src/third_party/libvpx/source/libvpx:24c0dcc851..6da1bd01d6* src/third_party/perfetto:00427277dd..9a3ec114fc* src/third_party/r8: TBaeKaSTY2ttKx2JSFuWiQ8Na80KHZwLEgSAvT1DBJ0C..WptUn43oi_BkFPtEyZTdUD9wZo1yy8OPVqFwdP3jmqoC * src/third_party/turbine: ZlMS4BOYyYmbU8BuBDGyW7QrkvZ_-pTkm4lH4jKjTi4C..laSnfZnTgkmZynERrjAlU3yeqB5rN446BctGmKQsZ64C * src/tools:3e78ed797e..723bed483d* src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1 * src/tools/luci-go: git_revision:fe3cfd422b1012c2c8cf00d65cdb11aa2c26cd66..git_revision:8b73cff3b780a7136c4904103f19124d2be3dee1 DEPS diff:6ac7929166..eef62e8a0c/DEPS Clang version changed llvmorg-17-init-16420-g0c545a44:llvmorg-18-init-4631-gd50b56d1 Details: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}
80 lines
2.3 KiB
Text
80 lines
2.3 KiB
Text
import("//webrtc.gni")
|
|
|
|
if (is_android) {
|
|
import("//third_party/jni_zero/jni_zero.gni")
|
|
rtc_android_apk("androidnativeapi") {
|
|
testonly = true
|
|
apk_name = "androidnativeapi"
|
|
android_manifest = "AndroidManifest.xml"
|
|
min_sdk_version = 21
|
|
target_sdk_version = 31
|
|
|
|
sources = [
|
|
"java/org/webrtc/examples/androidnativeapi/CallClient.java",
|
|
"java/org/webrtc/examples/androidnativeapi/MainActivity.java",
|
|
]
|
|
|
|
deps = [
|
|
":resources",
|
|
"//rtc_base:base_java",
|
|
"//sdk/android:camera_java",
|
|
"//sdk/android:surfaceviewrenderer_java",
|
|
"//sdk/android:video_api_java",
|
|
"//sdk/android:video_java",
|
|
"//third_party/androidx:androidx_annotation_annotation_java",
|
|
]
|
|
|
|
shared_libraries = [ ":examples_androidnativeapi_jni" ]
|
|
}
|
|
|
|
generate_jni("generated_jni") {
|
|
testonly = true
|
|
sources = [ "java/org/webrtc/examples/androidnativeapi/CallClient.java" ]
|
|
namespace = "webrtc_examples"
|
|
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
|
|
}
|
|
|
|
rtc_shared_library("examples_androidnativeapi_jni") {
|
|
testonly = true
|
|
sources = [
|
|
"jni/android_call_client.cc",
|
|
"jni/android_call_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:scoped_refptr",
|
|
"../../api:sequence_checker",
|
|
"../../rtc_base:ssl",
|
|
"../../rtc_base/synchronization:mutex",
|
|
"//api:libjingle_peerconnection_api",
|
|
"//api/rtc_event_log:rtc_event_log_factory",
|
|
"//api/task_queue:default_task_queue_factory",
|
|
"//media:rtc_audio_video",
|
|
"//media:rtc_internal_video_codecs",
|
|
"//media:rtc_media_engine_defaults",
|
|
"//modules/utility",
|
|
"//pc:libjingle_peerconnection",
|
|
"//sdk/android:native_api_base",
|
|
"//sdk/android:native_api_jni",
|
|
"//sdk/android:native_api_video",
|
|
]
|
|
}
|
|
|
|
android_resources("resources") {
|
|
testonly = true
|
|
custom_package = "org.webrtc.examples.androidnativeapi"
|
|
sources = [
|
|
"res/layout/activity_main.xml",
|
|
"res/values/strings.xml",
|
|
]
|
|
|
|
# Needed for Bazel converter.
|
|
resource_dirs = [ "res" ]
|
|
assert(resource_dirs != []) # Mark as used.
|
|
}
|
|
}
|