1diff --git a/packages/expo-gl/android/build.gradle b/packages/expo-gl/android/build.gradle 2index 32784fe8a6..bbbea44599 100644 3--- a/packages/expo-gl/android/build.gradle 4+++ b/packages/expo-gl/android/build.gradle 5@@ -21,6 +21,10 @@ file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { react 6 def REACT_NATIVE_VERSION = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME") 7 def REACT_NATIVE_TARGET_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger() 8 9+REACT_NATIVE_DIR = "${rootDir}/versioned-react-native" 10+REACT_NATIVE_BUILD_FROM_SOURCE = false 11+RN_SO_DIR = "${buildDir}/reactandroid-{VERSIONED_ABI_NAME}-*/jni" 12+ 13 def reactNativeArchitectures() { 14 def value = project.getProperties().get("reactNativeArchitectures") 15 return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] 16diff --git a/packages/expo-gl/android/src/main/cpp/EXGLJniApi.cpp b/packages/expo-gl/android/src/main/cpp/EXGLJniApi.cpp 17index e9211d47ad..6b2c3fbb85 100644 18--- a/packages/expo-gl/android/src/main/cpp/EXGLJniApi.cpp 19+++ b/packages/expo-gl/android/src/main/cpp/EXGLJniApi.cpp 20@@ -15,13 +15,13 @@ extern "C" { 21 thread_local JNIEnv* threadLocalEnv; 22 23 JNIEXPORT jint JNICALL 24-Java_expo_modules_gl_cpp_EXGL_EXGLContextCreate 25+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextCreate 26 (JNIEnv *env, jclass clazz) { 27 return EXGLContextCreate(); 28 } 29 30 JNIEXPORT void JNICALL 31-Java_expo_modules_gl_cpp_EXGL_EXGLContextPrepare 32+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextPrepare 33 (JNIEnv *env, jclass clazz, jlong jsiPtr, jint exglCtxId, jobject glContext) { 34 threadLocalEnv = env; 35 jclass GLContextClass = env->GetObjectClass(glContext); 36@@ -35,55 +35,55 @@ Java_expo_modules_gl_cpp_EXGL_EXGLContextPrepare 37 } 38 39 JNIEXPORT void JNICALL 40-Java_expo_modules_gl_cpp_EXGL_EXGLContextDestroy 41+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextDestroy 42 (JNIEnv *env, jclass clazz, jint exglCtxId) { 43 EXGLContextDestroy(exglCtxId); 44 } 45 46 JNIEXPORT void JNICALL 47-Java_expo_modules_gl_cpp_EXGL_EXGLContextFlush 48+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextFlush 49 (JNIEnv *env, jclass clazz, jint exglCtxId) { 50 EXGLContextFlush(exglCtxId); 51 } 52 53 JNIEXPORT jint JNICALL 54-Java_expo_modules_gl_cpp_EXGL_EXGLContextCreateObject 55+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextCreateObject 56 (JNIEnv *env, jclass clazz, jint exglCtxId) { 57 return EXGLContextCreateObject(exglCtxId); 58 } 59 60 JNIEXPORT void JNICALL 61-Java_expo_modules_gl_cpp_EXGL_EXGLContextDestroyObject 62+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextDestroyObject 63 (JNIEnv *env, jclass clazz, jint exglCtxId, jint exglObjId) { 64 EXGLContextDestroyObject(exglCtxId, exglObjId); 65 } 66 67 JNIEXPORT void JNICALL 68-Java_expo_modules_gl_cpp_EXGL_EXGLContextMapObject 69+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextMapObject 70 (JNIEnv *env, jclass clazz, jint exglCtxId, jint exglObjId, jint glObj) { 71 EXGLContextMapObject(exglCtxId, exglObjId, glObj); 72 } 73 74 JNIEXPORT jint JNICALL 75-Java_expo_modules_gl_cpp_EXGL_EXGLContextGetObject 76+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextGetObject 77 (JNIEnv *env, jclass clazz, jint exglCtxId, jint exglObjId) { 78 return EXGLContextGetObject(exglCtxId, exglObjId); 79 } 80 81 JNIEXPORT void JNICALL 82-Java_expo_modules_gl_cpp_EXGL_EXGLRegisterThread 83+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLRegisterThread 84 (JNIEnv *env, jclass clazz) { 85 threadLocalEnv = env; 86 } 87 88 JNIEXPORT bool JNICALL 89-Java_expo_modules_gl_cpp_EXGL_EXGLContextNeedsRedraw 90+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextNeedsRedraw 91 (JNIEnv *env, jclass clazz, jint exglCtxId) { 92 return EXGLContextNeedsRedraw(exglCtxId); 93 } 94 95 JNIEXPORT void JNICALL 96-Java_expo_modules_gl_cpp_EXGL_EXGLContextDrawEnded 97+Java_{VERSIONED_ABI_NAME_JNI_ESCAPED}_expo_modules_gl_cpp_EXGL_EXGLContextDrawEnded 98 (JNIEnv *env, jclass clazz, jint exglCtxId) { 99 EXGLContextDrawEnded(exglCtxId); 100 } 101