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

81 lines
2.3 KiB
Plaintext
Raw Normal View History

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("androidnativeapi") {
testonly = true
apk_name = "androidnativeapi"
android_manifest = "AndroidManifest.xml"
Roll chromium_revision 4d95e6c77b..71a0e1904e (776481:782339) Change log: https://chromium.googlesource.com/chromium/src/+log/4d95e6c77b..71a0e1904e Full diff: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/2df7267880..736d9fb42c * src/build: https://chromium.googlesource.com/chromium/src/build/+log/a03951acb9..876a780600 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/1b066f0216..1ed99573d5 * src/buildtools/linux64: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/buildtools/mac: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/buildtools/win: git_revision:d0a6f072070988e7b038496c4e7d6c562b649732..git_revision:7d7e8deea36d126397bda2cf924682504271f0e1 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/9200aad36b..73c8bcb1b1 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/502600d41a..77ba7104d5 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/e0df6e10ad..1908162da7 * src/third_party/android_deps/libs/androidx_activity_activity: version:1.0.0-cr0..version:1.1.0-cr0 * src/third_party/android_deps/libs/androidx_arch_core_core_runtime: version:2.0.0-cr0..version:2.1.0-cr0 * src/third_party/android_deps/libs/androidx_fragment_fragment: version:1.1.0-cr0..version:1.2.5-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core: version:2.0.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel: version:2.1.0-cr0..version:2.2.0-cr0 * src/third_party/android_deps/libs/androidx_preference_preference: version:1.0.0-cr0..version:1.1.1-cr0 * src/third_party/android_deps/libs/org_robolectric_shadows_multidex: version:4.3.1-cr0..version:4.3.1-cr1 * src/third_party/android_sdk/public: CR25ixsRhwuRnhdgDpGFyl9S0C_0HO9SUgFrwX46zq8C..uM0XtAW9BHh8phcbhBDA9GfzP3bku2SP7AiMahhimnoC * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/88024df121..430a742303 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2ad47493f8..e0658a4adf * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/37e562110f..87c8b91639 * src/third_party/espresso: c92dcfc4e894555a0b3c309f2b7939640eb1fee4..y8fIfH8Leo2cPm7iGCYnBxZpwOlgLv8rm2mlcmJlvGsC * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/be66dc5fd0..23b2a15c25 * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/62fea391fa..a443474755 * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/630b884f84..79326efe26 * src/third_party/libaom/source/libaom: https://aomedia.googlesource.com/aom.git/+log/2aa13c436e..e1ebb418eb * src/third_party/libunwindstack: https://chromium.googlesource.com/chromium/src/third_party/libunwindstack.git/+log/046920fc49..11659d420a * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/c176557314..769129fb29 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/60cf022c02..44e38c4643 * src/third_party/r8: gobCh01BNwJNyLHHNFUmLWSMaAbe4x3izuzBFzxQpDoC..B467c9t23JiW_6XGqhvHvtEKWSkrPS2xG_gho_gbAI4C * src/third_party/turbine: 3UJ600difG3ThRhtYrN9AfZ5kh8wCYtBiii1-NMlCrMC..mr9FyghUYWLYv4L5Nr3C_oceLfmmybnFgAi366GjQoYC * src/third_party/turbine/src: https://chromium.googlesource.com/external/github.com/google/turbine.git/+log/95f6fb6f1e..1c98ea6854 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/050a4a5e26..d6998993f9 Added dependency * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate DEPS diff: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e/DEPS Clang version changed f7f1abdb8893af4a606ca1a8f5347a426e9c7f9e:4e813bbdf Details: https://chromium.googlesource.com/chromium/src/+/4d95e6c77b..71a0e1904e/tools/clang/scripts/update.py TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,marpan@webrtc.org, jianj@chromium.org, BUG=None Change-Id: Idb4a2ccc6eab502ecf78b34247a479ff5726b50a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178084 Reviewed-by: Jeremy Leconte <jleconte@google.com> Reviewed-by: Autoroller <chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#31569}
2020-06-25 22:57:49 +02:00
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:enable_media_with_defaults",
"../../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",
"//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.
}
}