Misc changes

Author: rohansjoshi

extension/android/CMakeLists.txt

@@ -69,14 +69,10 @@ set_target_properties(
 
 executorch_target_link_options_shared_lib(executorch)
 
-<<<<<<< HEAD
 add_library(
   executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp
                         jni/jni_helper.cpp
 )
-=======
-add_library(executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp)
->>>>>>> 37d0a6944a (Whisper JNI first commit)
 
 set(link_libraries)
 list(
@@ -245,7 +241,9 @@ endif()
 
 if(EXECUTORCH_BUILD_WHISPER_JNI)
   target_sources(executorch_jni PRIVATE jni/jni_layer_whisper.cpp jni/log.cpp)
-  target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_WHISPER_JNI=1)
+  target_compile_definitions(
+    executorch_jni PUBLIC EXECUTORCH_BUILD_WHISPER_JNI=1
+  )
   if(QNN_SDK_ROOT)
     target_sources(
       executorch_jni

extension/android/jni/jni_layer_whisper.cpp

@@ -174,4 +174,3 @@ class ExecuTorchWhisperJni
 void register_natives_for_whisper() {
   executorch_jni::ExecuTorchWhisperJni::registerNatives();
 }
-