0d65fb5451
Using relative paths for JNI includes is causing build failures in chromium.
WebRTC already uses full include paths for generated JNI headers, so this CL
just removes the "jni_package" parameter from WebRTC generate_jni() targets
and removes the "jni/" portion of includes. The "jni_package" variable will be
removed from the generate_jni() template shortly.
To fix includes:
find . -name *.cc -exec sed -i -E 's@(#include.+generated.+jni)/jni/(.+_jni.h)@\1/\2@' {} \;
See https://groups.google.com/a/chromium.org/forum/?#!topic/java/MEovGrAwbqI
for discussion on naming scheme.
No-Try: True
TBR: kwiberg@webrtc.org
Bug: chromium:964169
Change-Id: I758c1b41bf6f5005587e55b82f14065fe251baad
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143521
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28380}
75 lines
2.1 KiB
Plaintext
75 lines
2.1 KiB
Plaintext
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/task_queue:default_task_queue_factory",
|
|
"//logging:rtc_event_log_impl_base",
|
|
"//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",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
]
|
|
}
|
|
|
|
android_resources("resources") {
|
|
testonly = true
|
|
resource_dirs = [ "res" ]
|
|
custom_package = "org.webrtc.examples.androidnativeapi"
|
|
}
|
|
}
|