From ecb871d490b746f11a29470c6df0a07108c645d9 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Fri, 5 Feb 2021 18:53:34 +0000 Subject: [PATCH] Add host required arguments to FontFamily_getVariant Native critical methods are not supported when running on host JVM. They need the environment and class arguments. To add those only for host, this uses specially defined macros. Bug: 74062470 Test: lunch sdk && m libandroid_runtime Change-Id: I9efff6e4f1132f0566e72c6c91ab101d10c1406a --- libs/hwui/jni/fonts/FontFamily.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/hwui/jni/fonts/FontFamily.cpp b/libs/hwui/jni/fonts/FontFamily.cpp index a07723f39b0cc..8fe6da3183f46 100644 --- a/libs/hwui/jni/fonts/FontFamily.cpp +++ b/libs/hwui/jni/fonts/FontFamily.cpp @@ -95,7 +95,7 @@ static jstring FontFamily_getLangTags(JNIEnv* env, jobject, jlong familyPtr) { } // CriticalNative -static jint FontFamily_getVariant(jlong familyPtr) { +static jint FontFamily_getVariant(CRITICAL_JNI_PARAMS_COMMA jlong familyPtr) { FontFamilyWrapper* family = reinterpret_cast(familyPtr); return static_cast(family->family->variant()); }