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}
31 lines
1009 B
C++
31 lines
1009 B
C++
/*
|
|
* Copyright 2017 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 <jni.h>
|
|
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Decoder_jni.h"
|
|
#include "sdk/android/generated_libvpx_vp8_jni/LibvpxVp8Encoder_jni.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
static jlong JNI_LibvpxVp8Encoder_CreateEncoder(JNIEnv* jni) {
|
|
return jlongFromPointer(VP8Encoder::Create(nullptr).release());
|
|
}
|
|
|
|
static jlong JNI_LibvpxVp8Decoder_CreateDecoder(JNIEnv* jni) {
|
|
return jlongFromPointer(VP8Decoder::Create().release());
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|