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

80 lines
2.3 KiB
Plaintext
Raw Normal View History

import("//webrtc.gni")
if (is_android) {
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
Roll chromium_revision 6ae0f0cd4c..bf62d746a4 (669703:669828) + fix AndroidManifest In https://chromium-review.googlesource.com/1650265 attributes like minSdkVersion were moved from AndroidManifest.xml to GN files. For WebRTC there were a few problems with that. * We don't want to suppress UsesMinSdkAttributes lint but now there are these "invalid" manifest files that we can't exclude or discern. So disable this lint error. https://chromium-review.googlesource.com/c/chromium/src/+/1650265/14/build/android/AndroidManifest.xml * We should specify the versions in GN files, so I did that here (by exactly copying the versions that are already in the targets' corresponding XML files), but we never want to get rid of them in the XML files. For now this information will just be duplicated (without any synchronicity check!) so there should be followup to this. Change log: https://chromium.googlesource.com/chromium/src/+log/6ae0f0cd4c..bf62d746a4 Full diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/9e5e9332df..e5a1d1f652 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a031748ec..2ef566e990 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6ae683be2f..6f3775ad6e * src/buildtools/linux64: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/mac: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/buildtools/win: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f5c817266..7f1a97d593 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/1d4247de57..b1b36ff0d4 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6f7cbf7c46..42e96c4074 * src/third_party/android_sdk/public: ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C..xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC * src/third_party/android_sdk/public: iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC..ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC * src/third_party/android_sdk/public: 4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C..MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ed9fcf3f70..9e5dbd8b46 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f58f33bca1..a9a4b8fc7b DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4/DEPS No update to Clang. Bug: chromium:891996 Change-Id: I773d6fa90e8083d934c84eecc1cb9d7d4496eca0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142235 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28311}
2019-06-18 17:09:51 +02:00
target_sdk_version = 27
sources = [
"java/org/webrtc/examples/androidnativeapi/CallClient.java",
"java/org/webrtc/examples/androidnativeapi/MainActivity.java",
]
deps = [
":resources",
"//modules/audio_device:audio_device_java",
"//rtc_base:base_java",
"//sdk/android:camera_java",
"//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java",
"//sdk/android:video_java",
"//third_party/android_deps:com_android_support_support_annotations_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: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",
"//rtc_base",
"//rtc_base:rtc_base_approved",
"//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.
}
}