Revert "jni_zero: rename jni_zero_helper.h to jni_zero.h"
This reverts commit 8c6c3cce1b
.
Reason for revert: Changed my mind, will leave jni_zero_helper.h as is
Original change's description:
> jni_zero: rename jni_zero_helper.h to jni_zero.h
>
> The followup here will be to merge all the headers together.
>
> Bug: 325057352
> Change-Id: Ic663016205b52f44b10ac3a0eaca132c4b0ac3e0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5292374
> Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> Auto-Submit: Sam Maier <smaier@chromium.org>
> Owners-Override: Sam Maier <smaier@chromium.org>
> Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1259956}
Bug: 325057352
Change-Id: Ia1343346f65101877556fc64acf348c2f3dc4be3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5291842
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1259991}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
4da45a42fa
commit
aa615189cd
chrome
android
modules
cablev2_authenticator
internal
stack_unwinder
internal
test_dummy
internal
browser
chromecast/app/android
docs
third_party
cardboard
src_overrides
jni_zero
BUILD.gn
golden
testBidirectionalClass-SampleForTests_jni.h.goldentestBirectionalNonProxy-SampleBidirectionalNonProxy_jni.h.goldentestEndToEndManualRegistration-Registration.h.goldentestEndToEndManualRegistration_NonProxy-Registration.h.goldentestEndToEndProxyHashed-Registration.h.goldentestEndToEndProxyJniWithModules-Registration.h.goldentestEndToEndProxyJniWithModules-SampleModule_jni.h.goldentestForTestingKept-Registration.h.goldentestForTestingKept-SampleProxyEdgeCases_jni.h.goldentestForTestingRemoved-Registration.h.goldentestFromClassFile-JavapClass_jni.h.goldentestMultiplexing-Registration.h.goldentestNonProxy-SampleNonProxy_jni.h.goldentestPackagePrefixGenerator-SampleForTests_jni.h.goldentestPackagePrefixWithManualRegistration-Registration.h.goldentestPackagePrefixWithManualRegistrationWithProxyHash-Registration.h.goldentestPackagePrefixWithProxyHash-Registration.h.goldentestUniqueAnnotations-SampleUniqueAnnotations_jni.h.golden
integration_tests.pyjni_registration_generator.pyjni_zero.gnijni_zero_helper.hsamples
@ -4,7 +4,7 @@
|
||||
|
||||
#include "base/android/jni_utils.h"
|
||||
#include "chrome/android/modules/cablev2_authenticator/internal/cablev2_authenticator__jni_registration_generated.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
extern "C" {
|
||||
// This JNI registration method is found and called by module framework code.
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
#include "base/android/jni_utils.h"
|
||||
#include "chrome/android/modules/stack_unwinder/internal/stack_unwinder__jni_registration_generated.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
extern "C" {
|
||||
// This JNI registration method is found and called by module framework
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
#include "base/android/jni_utils.h"
|
||||
#include "chrome/android/modules/test_dummy/internal/test_dummy__jni_registration_generated.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
extern "C" {
|
||||
// This JNI registration method is found and called by module framework code.
|
||||
|
@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
// This method is required by the module loading backend. And it is supposed to
|
||||
// register VR's native JNI methods. However, since VR's Android-specific native
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "chromecast/app/cast_main_delegate.h"
|
||||
#include "content/public/app/content_main.h"
|
||||
#include "content/public/browser/android/compositor.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
extern "C" {
|
||||
// This JNI registration method is found and called by module framework code.
|
||||
|
@ -453,9 +453,9 @@ First, build a module native interface. Supply a JNI method named
|
||||
on all Chrome build variants, including Monochrome (unlike base module JNI).
|
||||
|
||||
```c++
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
#include "base/android/jni_utils.h"
|
||||
#include "chrome/android/modules/foo/internal/jni_registration.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
|
||||
extern "C" {
|
||||
// This JNI registration method is found and called by module framework code.
|
||||
|
2
third_party/cardboard/src_overrides/DEPS
vendored
2
third_party/cardboard/src_overrides/DEPS
vendored
@ -1,5 +1,5 @@
|
||||
include_rules = [
|
||||
"+base/android/jni_android.h",
|
||||
"+third_party/jni_zero/jni_int_wrapper.h",
|
||||
'+third_party/jni_zero/jni_zero.h',
|
||||
'+third_party/jni_zero/jni_zero_helper.h',
|
||||
]
|
||||
|
2
third_party/jni_zero/BUILD.gn
vendored
2
third_party/jni_zero/BUILD.gn
vendored
@ -23,7 +23,7 @@ component("jni_zero") {
|
||||
"core.cc",
|
||||
"core.h",
|
||||
"jni_int_wrapper.h",
|
||||
"jni_zero.h",
|
||||
"jni_zero_helper.h",
|
||||
"logging.cc",
|
||||
"logging.h",
|
||||
"scoped_java_ref.cc",
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
2
third_party/jni_zero/golden/testBirectionalNonProxy-SampleBidirectionalNonProxy_jni.h.golden
vendored
2
third_party/jni_zero/golden/testBirectionalNonProxy-SampleBidirectionalNonProxy_jni.h.golden
vendored
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
2
third_party/jni_zero/golden/testEndToEndManualRegistration_NonProxy-Registration.h.golden
vendored
2
third_party/jni_zero/golden/testEndToEndManualRegistration_NonProxy-Registration.h.golden
vendored
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
2
third_party/jni_zero/golden/testPackagePrefixWithManualRegistration-Registration.h.golden
vendored
2
third_party/jni_zero/golden/testPackagePrefixWithManualRegistration-Registration.h.golden
vendored
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations.
|
||||
|
2
third_party/jni_zero/integration_tests.py
vendored
2
third_party/jni_zero/integration_tests.py
vendored
@ -26,7 +26,7 @@ import zipfile
|
||||
|
||||
_SCRIPT_DIR = os.path.normpath(os.path.dirname(__file__))
|
||||
_GOLDENS_DIR = os.path.join(_SCRIPT_DIR, 'golden')
|
||||
_EXTRA_INCLUDES = 'third_party/jni_zero/jni_zero.h'
|
||||
_EXTRA_INCLUDES = 'third_party/jni_zero/jni_zero_helper.h'
|
||||
_JAVA_SRC_DIR = os.path.join(_SCRIPT_DIR, 'samples', 'java', 'src', 'org',
|
||||
'jni_zero', 'samples')
|
||||
|
||||
|
@ -434,7 +434,7 @@ def CreateFromDict(options, registration_dict):
|
||||
|
||||
#include "third_party/jni_zero/jni_export.h"
|
||||
#include "third_party/jni_zero/jni_int_wrapper.h"
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
|
||||
// Step 1: Forward declarations (classes).
|
||||
|
2
third_party/jni_zero/jni_zero.gni
vendored
2
third_party/jni_zero/jni_zero.gni
vendored
@ -251,7 +251,7 @@ template("generate_jni_impl") {
|
||||
if (defined(invoker.jni_generator_include)) {
|
||||
_jni_generator_include = invoker.jni_generator_include
|
||||
} else {
|
||||
_jni_generator_include = "//third_party/jni_zero/jni_zero.h"
|
||||
_jni_generator_include = "//third_party/jni_zero/jni_zero_helper.h"
|
||||
}
|
||||
|
||||
# The sources aren't compiled so don't check their dependencies.
|
||||
|
@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef JNI_ZERO_JNI_ZERO_H_
|
||||
#define JNI_ZERO_JNI_ZERO_H_
|
||||
#ifndef JNI_ZERO_JNI_ZERO_HELPER_H_
|
||||
#define JNI_ZERO_JNI_ZERO_HELPER_H_
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
@ -114,4 +114,4 @@ static_assert(sizeof(JniJavaCallContextChecked) ==
|
||||
|
||||
} // namespace jni_zero
|
||||
|
||||
#endif // JNI_ZERO_JNI_ZERO_H_
|
||||
#endif // JNI_ZERO_JNI_ZERO_HELPER_H_
|
@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
// This is called by the VM when the shared library is first loaded.
|
||||
__attribute__((visibility("default"))) jint JNI_OnLoad(JavaVM* vm,
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <jni.h>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include "third_party/jni_zero/jni_zero.h"
|
||||
#include "third_party/jni_zero/jni_zero_helper.h"
|
||||
|
||||
namespace jni_zero {
|
||||
namespace samples {
|
||||
|
Reference in New Issue
Block a user