mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
73 lines
2.1 KiB
Text
73 lines
2.1 KiB
Text
import("//webrtc.gni")
|
|
|
|
if (is_android) {
|
|
rtc_android_apk("androidnativeapi") {
|
|
testonly = true
|
|
apk_name = "androidnativeapi"
|
|
android_manifest = "AndroidManifest.xml"
|
|
min_sdk_version = 19
|
|
target_sdk_version = 27
|
|
|
|
java_files = [
|
|
"java/org/webrtc/examples/androidnativeapi/MainActivity.java",
|
|
"java/org/webrtc/examples/androidnativeapi/CallClient.java",
|
|
]
|
|
|
|
deps = [
|
|
":resources",
|
|
"//modules/audio_device:audio_device_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
|
|
resource_dirs = [ "res" ]
|
|
custom_package = "org.webrtc.examples.androidnativeapi"
|
|
}
|
|
}
|