Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Port CRITICAL_JNI_PARAMS from internal master"

Browse Source 
am: f2fe7f0b61

Change-Id: Ie6cdbed1c24281b2ce12de30baf81ada44314c8f
This commit is contained in:
Daniel Colascione
2019-11-19 15:17:44 -08:00
committed by android-build-merger
parent 3e4a53735e f2fe7f0b61
commit 260710644c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/core_jni_helpers.h
View File

@@ -22,6 +22,18 @@
#include <nativehelper/scoped_utf_chars.h> #include <nativehelper/scoped_utf_chars.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
// Host targets (layoutlib) do not differentiate between regular and critical native methods,
// and they need all the JNI methods to have JNIEnv* and jclass/jobject as their first two arguments.
// The following macro allows to have those arguments when compiling for host while omitting them when
// compiling for Android.
#ifdef __ANDROID__
#define CRITICAL_JNI_PARAMS
#define CRITICAL_JNI_PARAMS_COMMA
#else
#define CRITICAL_JNI_PARAMS JNIEnv*, jclass
#define CRITICAL_JNI_PARAMS_COMMA JNIEnv*, jclass,
#endif
namespace android { namespace android {
// Defines some helpful functions. // Defines some helpful functions.