diff options
| author | Vladimir Marko <vmarko@google.com> | 2024-04-18 10:23:38 +0000 |
|---|---|---|
| committer | Vladimír Marko <vmarko@google.com> | 2024-04-18 15:24:53 +0000 |
| commit | 718bcbec38cd83efa0499deb6c20d271798abd2e (patch) | |
| tree | edc51f3812511d441d32dcb7a1a481e89aa0ca6c | |
| parent | b1eb2853b3e6349bac4f2cd5c2ee47458198399d (diff) | |
| download | art-718bcbec38cd83efa0499deb6c20d271798abd2e.tar.gz | |
ART: Fix missing nativeloader symbols for Golem.
Test: Build for Golem.
Bug: 330367443
Change-Id: I07e853280a8e53df077b6a30a7a99cb442c0c742
| -rw-r--r-- | runtime/jni/jni_internal.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc index d5629b8b01..69069968da 100644 --- a/runtime/jni/jni_internal.cc +++ b/runtime/jni/jni_internal.cc @@ -2917,7 +2917,7 @@ class JNI { static bool IsClassLoaderNamespaceNativelyBridged(ScopedObjectAccess& soa, ObjPtr<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_) { -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) ScopedLocalRef<jobject> jclass_loader(soa.Env(), soa.AddLocalReference<jobject>(class_loader)); android::NativeLoaderNamespace* ns = android::FindNativeLoaderNamespaceByClassLoader(soa.Env(), jclass_loader.get()); @@ -2930,7 +2930,7 @@ class JNI { static const void* GenerateNativeBridgeTrampoline(const void* fn_ptr, ArtMethod* method) REQUIRES_SHARED(Locks::mutator_lock_) { -#if defined(__ANDROID__) +#if defined(ART_TARGET_ANDROID) uint32_t shorty_length; const char* shorty = method->GetShorty(&shorty_length); android::JNICallType jni_call_type = method->IsCriticalNative() ? |