build: reorg jni files

app/src/main/cpp/CMakeLists.txt

@@ -30,17 +30,17 @@ add_subdirectory(librubberband)
 # used in the AndroidManifest.xml file.
 add_library(${CMAKE_PROJECT_NAME} SHARED
     # List C/C++ source files with relative paths to this CMakeLists.txt.
-    lockstep.cpp
     PlaybackEngine.cpp
     mp3file.cpp
-    jni_bridge.cpp
+    jni_mpg123.cpp
+    jni_lockstep.cpp
     jni_stepdetector.cpp
     StepDetector.cpp
 )
 
 find_package (oboe REQUIRED CONFIG)
 
-add_library(ndk-logger SHARED logging.cpp logging_jni.cpp)
+add_library(ndk-logger SHARED logging.cpp jni_logging.cpp)
 target_link_libraries(ndk-logger log)
 
 # Add pre-built libmpg123 library

app/src/main/cpp/jni_lockstep.cpp

@@ -1,21 +1,3 @@
-// Write C++ code here.
-//
-// Do not forget to dynamically load the C++ library into your application.
-//
-// For instance,
-//
-// In at.lockstep.app.MainActivity.java:
-//    static {
-//       System.loadLibrary("lockstep");
-//    }
-//
-// Or, in at.lockstep.app.MainActivity.kt:
-//    companion object {
-//      init {
-//         System.loadLibrary("lockstep")
-//      }
-//    }
-
 #include "PlaybackEngine.h"
 #include <jni.h>
 #include <oboe/Oboe.h>