Migrate choreographer-30fps to RegisterNatives.

Author: DanAlbert

teapots/choreographer-30fps/build.gradle

@@ -19,9 +19,14 @@ android {
             path 'src/main/cpp/CMakeLists.txt'
         }
     }
+
+    buildFeatures {
+        prefab true
+    }
 }
 
 dependencies {
+    implementation project(":base")
     implementation libs.appcompat
     implementation libs.androidx.constraintlayout
 }

teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt

@@ -18,6 +18,7 @@ cmake_minimum_required(VERSION 3.22.1)
 project(ChoreographerNativeActivity LANGUAGES C CXX)
 
 include(AppLibrary)
+find_package(base CONFIG REQUIRED)
 
 # build the ndk-helper library
 get_filename_component(commonDir ${CMAKE_CURRENT_SOURCE_DIR}/../../../../common ABSOLUTE)
@@ -40,6 +41,6 @@ set_target_properties(${PROJECT_NAME}
 # add lib dependencies
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+    base::base
     NdkHelper
 )
-

teapots/choreographer-30fps/src/main/cpp/ChoreographerNativeActivity.cpp

@@ -20,6 +20,7 @@
 #include <EGL/egl.h>
 #include <android/log.h>
 #include <android_native_app_glue.h>
+#include <base/macros.h>
 #include <dlfcn.h>
 
 #include <condition_variable>
@@ -303,9 +304,7 @@ void Engine::SynchInCallback(jlong frameTimeInNanos) {
   }
 };
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_sample_choreographer_ChoreographerNativeActivity_choregrapherCallback(
-    JNIEnv*, jobject, jlong frameTimeInNanos) {
+void ChoregrapherCallback(JNIEnv*, jobject, jlong frameTimeInNanos) {
   g_engine.SynchInCallback(frameTimeInNanos);
 }
 
@@ -611,4 +610,25 @@ void android_main(android_app* state) {
   }
 
   g_engine.TermDisplay();
-}
+}
+
+extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _Nonnull vm,
+                                             void* _Nullable) {
+  JNIEnv* env;
+  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+    return JNI_ERR;
+  }
+
+  jclass c =
+      env->FindClass("com/sample/choreographer/ChoreographerNativeActivity");
+  if (c == nullptr) return JNI_ERR;
+
+  static const JNINativeMethod methods[] = {
+      {"choregrapherCallback", "(J)V",
+       reinterpret_cast<void*>(ChoregrapherCallback)},
+  };
+  int rc = env->RegisterNatives(c, methods, arraysize(methods));
+  if (rc != JNI_OK) return rc;
+
+  return JNI_VERSION_1_6;
+}