diff --git a/decoder/CMakeLists.txt b/decoder/CMakeLists.txt
index 9ef0561..b7a3ca7 100644
--- a/decoder/CMakeLists.txt
+++ b/decoder/CMakeLists.txt
@@ -31,25 +31,28 @@ set(LIB_IRDECODE_SRC
         src/ir_decode.c
         src/ir_decode_test.c)
 
+set(LIB_JNI_SRC
+        src/ir_decode_jni.c)
+
 set(BIN_TEST_SRC
         src/ir_decode.c)
 
 # SET(CMAKE_SYSTEM_NAME Linux)
+
 ## ARMv7hf cross compile
 # SET(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabihf-gcc")
 # SET(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabihf-g++")
 # SET(CMAKE_FIND_ROOT_PATH "/usr/bin")
 
-# SET(CMAKE_SYSTEM_NAME Linux)
 ## ARMv7el cross compile
 # SET(CMAKE_C_COMPILER "/usr/bin/arm-linux-gnueabi-gcc")
 # SET(CMAKE_CXX_COMPILER "/usr/bin/arm-linux-gnueabi-g++")
 # SET(CMAKE_FIND_ROOT_PATH "/usr/bin")
 
 ## ARM64 cross compile
-# SET(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
-# SET(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
-# SET(CMAKE_FIND_ROOT_PATH "/usr/bin")
+SET(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
+SET(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
+SET(CMAKE_FIND_ROOT_PATH "/usr/bin")
 
 add_library(irdecode SHARED
         ${LIB_IRDECODE_SRC})
@@ -60,16 +63,26 @@ target_compile_options(irdecode PRIVATE
 add_library(irdecode_s STATIC
         ${LIB_IRDECODE_SRC})
 
-target_compile_options(irdecode_s PRIVATE
+target_compile_definitions(irdecode_s PRIVATE
         -DBOARD_PC)
 
 target_compile_options(irdecode_s PRIVATE
         -fPIC)
 
+add_library(irdecode_jni SHARED
+        ${LIB_IRDECODE_SRC}
+        ${LIB_JNI_SRC})
+
+target_include_directories(irdecode_jni PRIVATE
+        "${CMAKE_SOURCE_DIR}/src/jni")
+
+target_compile_definitions(irdecode_jni PRIVATE
+        -DBOARD_PC
+        -DBOARD_PC_JNI)
+
 add_executable(irdecode_test
+        ${LIB_IRDECODE_SRC}
         ${BIN_TEST_SRC})
 
-target_link_libraries(irdecode_test PRIVATE
-        irdecode)
-
-add_subdirectory("src/jni")
+target_compile_definitions(irdecode_test PRIVATE
+        -DBOARD_PC)
diff --git a/decoder/src/jni/src/ir_decode_jni.h b/decoder/src/include/ir_decode_jni.h
similarity index 99%
rename from decoder/src/jni/src/ir_decode_jni.h
rename to decoder/src/include/ir_decode_jni.h
index 4c3fa85..2175e99 100644
--- a/decoder/src/jni/src/ir_decode_jni.h
+++ b/decoder/src/include/ir_decode_jni.h
@@ -2,7 +2,7 @@
 #if defined BOARD_ANDROID
 #include <jni.h>
 #elif (defined BOARD_PC) && (defined BOARD_PC_JNI)
-#include "./include/jni.h"
+#include "include/jni.h"
 #endif
 /* Header for class net_irext_decode_sdk_IRDecode */
 
diff --git a/decoder/src/jni/src/ir_decode_jni.c b/decoder/src/ir_decode_jni.c
similarity index 100%
rename from decoder/src/jni/src/ir_decode_jni.c
rename to decoder/src/ir_decode_jni.c
diff --git a/decoder/src/jni/CMakeLists.txt b/decoder/src/jni/CMakeLists.txt
deleted file mode 100644
index a876adc..0000000
--- a/decoder/src/jni/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-########################################################
-project(ir_decode_jni)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    MESSAGE("compile platform : Linux")
-    add_definitions(-DPLATFORM_LINUX)
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
-    MESSAGE("compile platform : win32")
-    add_definitions(-DPLATFORM_WIN32)
-ELSE ()
-    MESSAGE("invalid compile platform")
-    add_definitions(-DPLATFORM_WIN32)
-ENDIF ()
-
-include_directories(
-        "${CMAKE_SOURCE_DIR}/src/include"
-        "src/include")
-
-set(LIB_IRDECODE_JNI_SRC
-        src/ir_decode_jni.c)
-
-add_library(irdecode_jni SHARED
-        ${LIB_IRDECODE_JNI_SRC})
-
-target_compile_definitions(irdecode_jni PRIVATE
-        -DBOARD_PC
-        -DBOARD_PC_JNI)
-
-target_link_libraries(irdecode_jni PRIVATE
-        irdecode_s)
diff --git a/decoder/src/jni/src/include/classfile_constants.h b/decoder/src/jni/include/classfile_constants.h
similarity index 100%
rename from decoder/src/jni/src/include/classfile_constants.h
rename to decoder/src/jni/include/classfile_constants.h
diff --git a/decoder/src/jni/src/include/jawt.h b/decoder/src/jni/include/jawt.h
similarity index 100%
rename from decoder/src/jni/src/include/jawt.h
rename to decoder/src/jni/include/jawt.h
diff --git a/decoder/src/jni/src/include/jdwpTransport.h b/decoder/src/jni/include/jdwpTransport.h
similarity index 100%
rename from decoder/src/jni/src/include/jdwpTransport.h
rename to decoder/src/jni/include/jdwpTransport.h
diff --git a/decoder/src/jni/src/include/jni.h b/decoder/src/jni/include/jni.h
similarity index 100%
rename from decoder/src/jni/src/include/jni.h
rename to decoder/src/jni/include/jni.h
diff --git a/decoder/src/jni/src/include/jvmti.h b/decoder/src/jni/include/jvmti.h
similarity index 100%
rename from decoder/src/jni/src/include/jvmti.h
rename to decoder/src/jni/include/jvmti.h
diff --git a/decoder/src/jni/src/include/jvmticmlr.h b/decoder/src/jni/include/jvmticmlr.h
similarity index 100%
rename from decoder/src/jni/src/include/jvmticmlr.h
rename to decoder/src/jni/include/jvmticmlr.h
diff --git a/decoder/src/jni/src/include/linux/jawt_md.h b/decoder/src/jni/include/linux/jawt_md.h
similarity index 100%
rename from decoder/src/jni/src/include/linux/jawt_md.h
rename to decoder/src/jni/include/linux/jawt_md.h
diff --git a/decoder/src/jni/src/include/linux/jni_md.h b/decoder/src/jni/include/linux/jni_md.h
similarity index 100%
rename from decoder/src/jni/src/include/linux/jni_md.h
rename to decoder/src/jni/include/linux/jni_md.h
diff --git a/decoder/src/jni/src/include/win32/bridge/AccessBridgeCallbacks.h b/decoder/src/jni/include/win32/bridge/AccessBridgeCallbacks.h
similarity index 100%
rename from decoder/src/jni/src/include/win32/bridge/AccessBridgeCallbacks.h
rename to decoder/src/jni/include/win32/bridge/AccessBridgeCallbacks.h
diff --git a/decoder/src/jni/src/include/win32/bridge/AccessBridgeCalls.c b/decoder/src/jni/include/win32/bridge/AccessBridgeCalls.c
similarity index 100%
rename from decoder/src/jni/src/include/win32/bridge/AccessBridgeCalls.c
rename to decoder/src/jni/include/win32/bridge/AccessBridgeCalls.c
diff --git a/decoder/src/jni/src/include/win32/bridge/AccessBridgeCalls.h b/decoder/src/jni/include/win32/bridge/AccessBridgeCalls.h
similarity index 100%
rename from decoder/src/jni/src/include/win32/bridge/AccessBridgeCalls.h
rename to decoder/src/jni/include/win32/bridge/AccessBridgeCalls.h
diff --git a/decoder/src/jni/src/include/win32/bridge/AccessBridgePackages.h b/decoder/src/jni/include/win32/bridge/AccessBridgePackages.h
similarity index 100%
rename from decoder/src/jni/src/include/win32/bridge/AccessBridgePackages.h
rename to decoder/src/jni/include/win32/bridge/AccessBridgePackages.h
diff --git a/decoder/src/jni/src/include/win32/jawt_md.h b/decoder/src/jni/include/win32/jawt_md.h
similarity index 100%
rename from decoder/src/jni/src/include/win32/jawt_md.h
rename to decoder/src/jni/include/win32/jawt_md.h
diff --git a/decoder/src/jni/src/include/win32/jni_md.h b/decoder/src/jni/include/win32/jni_md.h
similarity index 100%
rename from decoder/src/jni/src/include/win32/jni_md.h
rename to decoder/src/jni/include/win32/jni_md.h
diff --git a/decoder/toolchain-amd64.cmake b/decoder/toolchain-amd64.cmake
deleted file mode 100755
index d3d2f9a..0000000
--- a/decoder/toolchain-amd64.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-set(CMAKE_C_COMPILER gcc)
-set(CMAKE_CXX_COMPILER g++)
\ No newline at end of file
diff --git a/decoder/toolchain-arm64.cmake b/decoder/toolchain-arm64.cmake
deleted file mode 100755
index 70fdefb..0000000
--- a/decoder/toolchain-arm64.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR arm64)
-set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
-set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
\ No newline at end of file
diff --git a/decoder/toolchain-armv7el.cmake b/decoder/toolchain-armv7el.cmake
deleted file mode 100755
index 763e74f..0000000
--- a/decoder/toolchain-armv7el.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR armv7el)
-set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++)
\ No newline at end of file