JNI refactoring

4 years ago · 5caa95144c
parent 24473e25a0
commit 5caa95144c
24 changed files with 12 additions and 14 deletions
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@ -1,22 +1,20 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
-add_definitions(-DHAVE_MEMRCHR)
+add_library(compact_enc_det SHARED
 	src/main/jni/charset.cc
 	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
 	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
 	src/main/jni/compact_enc_det/util/encodings/encodings.cc
 	src/main/jni/compact_enc_det/util/languages/languages.cc
 )
-add_library( compact_enc_det
+include_directories(src/main/jni/compact_enc_det)
             SHARED
             src/main/jni/charset.cc
             src/main/jni/compact_enc_det/compact_enc_det.cc
             src/main/jni/compact_enc_det/compact_enc_det_hint_code.cc
             src/main/jni/util/encodings/encodings.cc
             src/main/jni/util/languages/languages.cc )
-include_directories( src/main/jni/ )
+find_library(log-lib log)
-find_library( log-lib
+add_definitions(-DHAVE_MEMRCHR)
              log )
 target_compile_options(compact_enc_det PRIVATE -Wno-c++11-narrowing)
-target_link_libraries( compact_enc_det
+target_link_libraries(compact_enc_det ${log-lib})
                       ${log-lib} )
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.h
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.h
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_fuzz_test.cc
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_fuzz_test.cc
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables.h
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables.h
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables2.h
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_generated_tables2.h
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.h
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.h
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_unittest.cc
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_unittest.cc
--- a/app/src/main/jni/compact_enc_det/compact_enc_det/detail_head_string.inc
+++ b/app/src/main/jni/compact_enc_det/compact_enc_det/detail_head_string.inc
--- a/app/src/main/jni/compact_enc_det/util/basictypes.h
+++ b/app/src/main/jni/compact_enc_det/util/basictypes.h
--- a/app/src/main/jni/compact_enc_det/util/case_insensitive_hash.h
+++ b/app/src/main/jni/compact_enc_det/util/case_insensitive_hash.h
--- a/app/src/main/jni/compact_enc_det/util/commandlineflags.h
+++ b/app/src/main/jni/compact_enc_det/util/commandlineflags.h
--- a/app/src/main/jni/compact_enc_det/util/encodings/encodings.cc
+++ b/app/src/main/jni/compact_enc_det/util/encodings/encodings.cc
--- a/app/src/main/jni/compact_enc_det/util/encodings/encodings.h
+++ b/app/src/main/jni/compact_enc_det/util/encodings/encodings.h
--- a/app/src/main/jni/compact_enc_det/util/encodings/encodings.pb.h
+++ b/app/src/main/jni/compact_enc_det/util/encodings/encodings.pb.h
--- a/app/src/main/jni/compact_enc_det/util/encodings/encodings_unittest.cc
+++ b/app/src/main/jni/compact_enc_det/util/encodings/encodings_unittest.cc
--- a/app/src/main/jni/compact_enc_det/util/languages/languages.cc
+++ b/app/src/main/jni/compact_enc_det/util/languages/languages.cc
--- a/app/src/main/jni/compact_enc_det/util/languages/languages.h
+++ b/app/src/main/jni/compact_enc_det/util/languages/languages.h
--- a/app/src/main/jni/compact_enc_det/util/languages/languages.pb.h
+++ b/app/src/main/jni/compact_enc_det/util/languages/languages.pb.h
--- a/app/src/main/jni/compact_enc_det/util/logging.h
+++ b/app/src/main/jni/compact_enc_det/util/logging.h
--- a/app/src/main/jni/compact_enc_det/util/port.h
+++ b/app/src/main/jni/compact_enc_det/util/port.h
--- a/app/src/main/jni/compact_enc_det/util/string_util.h
+++ b/app/src/main/jni/compact_enc_det/util/string_util.h
--- a/app/src/main/jni/compact_enc_det/util/varsetter.h
+++ b/app/src/main/jni/compact_enc_det/util/varsetter.h