mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
7534ebd2bf
This reverts commitdb30009304. Reason for revert: ... and it's out again :( Original change's description: > Reland "Reland "Delete old Android ADM."" > > This reverts commit38a28603fd. > > Reason for revert: Attempt to reland, now that WebRTC dependency cycle has been broken. > > Original change's description: > > Revert "Reland "Delete old Android ADM."" > > > > This reverts commit6e4d7e606c. > > > > Reason for revert: Still breaks downstream build (though in a different way this time) > > > > Original change's description: > > > Reland "Delete old Android ADM." > > > > > > This is a reland of commit4ec3e9c988> > > > > > Original change's description: > > > > Delete old Android ADM. > > > > > > > > The schedule move Android ADM code to sdk directory have been around > > > > for several years, but the old code still not delete. > > > > > > > > Bug: webrtc:7452 > > > > Change-Id: I0f75c680f71f0b2ce614de6cbd9f124c2a59d453 > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264620 > > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > > Commit-Queue: Henrik Andreassson <henrika@webrtc.org> > > > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > > > Cr-Commit-Position: refs/heads/main@{#37174} > > > > > > Bug: webrtc:7452 > > > Change-Id: Icabad23e72c8258a854b7809a93811161517266c > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265872 > > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > > Commit-Queue: Björn Terelius <terelius@webrtc.org> > > > Cr-Commit-Position: refs/heads/main@{#37236} > > > > Bug: webrtc:7452 > > Change-Id: Ide8fbd55fadd7aed9989053afff7c63c04f1320f > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266023 > > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > > Commit-Queue: Björn Terelius <terelius@webrtc.org> > > Owners-Override: Björn Terelius <terelius@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#37242} > > Bug: webrtc:7452 > Change-Id: I6946d0fc28cf4c08387e451e6a07765f7410ce7c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266980 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37356} Bug: webrtc:7452 Change-Id: I1ef4004e89c8bea322bda0dc697a7ba45abeffcc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267067 Owners-Override: Björn Terelius <terelius@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Björn Terelius <terelius@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37359}
80 lines
2.3 KiB
Text
80 lines
2.3 KiB
Text
import("//webrtc.gni")
|
|
|
|
if (is_android) {
|
|
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",
|
|
"//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/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/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",
|
|
"//rtc_base",
|
|
"//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.
|
|
}
|
|
}
|