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}
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "sdk/android/src/jni/pc/crypto_options.h"
|
|
|
|
#include "sdk/android/generated_peerconnection_jni/CryptoOptions_jni.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
absl::optional<CryptoOptions> JavaToNativeOptionalCryptoOptions(
|
|
JNIEnv* jni,
|
|
const JavaRef<jobject>& j_crypto_options) {
|
|
if (j_crypto_options.is_null()) {
|
|
return absl::nullopt;
|
|
}
|
|
|
|
ScopedJavaLocalRef<jobject> j_srtp =
|
|
Java_CryptoOptions_getSrtp(jni, j_crypto_options);
|
|
ScopedJavaLocalRef<jobject> j_sframe =
|
|
Java_CryptoOptions_getSFrame(jni, j_crypto_options);
|
|
|
|
CryptoOptions native_crypto_options;
|
|
native_crypto_options.srtp.enable_gcm_crypto_suites =
|
|
Java_Srtp_getEnableGcmCryptoSuites(jni, j_srtp);
|
|
native_crypto_options.srtp.enable_aes128_sha1_32_crypto_cipher =
|
|
Java_Srtp_getEnableAes128Sha1_32CryptoCipher(jni, j_srtp);
|
|
native_crypto_options.srtp.enable_encrypted_rtp_header_extensions =
|
|
Java_Srtp_getEnableEncryptedRtpHeaderExtensions(jni, j_srtp);
|
|
native_crypto_options.sframe.require_frame_encryption =
|
|
Java_SFrame_getRequireFrameEncryption(jni, j_sframe);
|
|
return absl::optional<CryptoOptions>(native_crypto_options);
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|