用静态文件替换动态文件，大幅减小aar文件大小

wuxinlingluan · Aug 1, 2019 · 2bb6aef · 2bb6aef
1 parent 5e3a99b
commit 2bb6aef
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ project.ext {
     applicationId = "me.devilsen.czxing"
     compileSdkVersion = 28
     buildToolsVersion = "29.0.0"
-    minSdkVersion = 16
+    minSdkVersion = 21
     targetSdkVersion = 28
     abortOnLintError = false
     checkLintRelease = false

diff --git a/czxing/build.gradle b/czxing/build.gradle
@@ -7,12 +7,13 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 5
-        versionName "0.4.5"
+        versionName "0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         externalNativeBuild {
             cmake {
+                cppFlags "-std=c++11 -frtti -fexceptions"
                 abiFilters "armeabi-v7a","arm64-v8a"
             }
         }
@@ -27,7 +28,7 @@ android {
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
-            version "3.10.2"
+//            version "3.10.2"
         }
     }
     compileOptions {

diff --git a/czxing/libs/arm64-v8a/libopencv_java4.so b/czxing/libs/arm64-v8a/libopencv_java4.so
diff --git a/czxing/libs/arm64-v8a/libzxing.so b/czxing/libs/arm64-v8a/libzxing.so
diff --git a/czxing/libs/armeabi-v7a/libopencv_java4.so b/czxing/libs/armeabi-v7a/libopencv_java4.so
diff --git a/czxing/libs/armeabi-v7a/libzxing.so b/czxing/libs/armeabi-v7a/libzxing.so
diff --git a/czxing/opencv/3rdparty/libs/arm64-v8a/libcpufeatures.a b/czxing/opencv/3rdparty/libs/arm64-v8a/libcpufeatures.a
diff --git a/czxing/opencv/3rdparty/libs/arm64-v8a/libtbb.a b/czxing/opencv/3rdparty/libs/arm64-v8a/libtbb.a
diff --git a/czxing/opencv/3rdparty/libs/arm64-v8a/libtegra_hal.a b/czxing/opencv/3rdparty/libs/arm64-v8a/libtegra_hal.a
diff --git a/czxing/opencv/3rdparty/libs/armeabi-v7a/libcpufeatures.a b/czxing/opencv/3rdparty/libs/armeabi-v7a/libcpufeatures.a
diff --git a/czxing/opencv/3rdparty/libs/armeabi-v7a/libtbb.a b/czxing/opencv/3rdparty/libs/armeabi-v7a/libtbb.a
diff --git a/czxing/opencv/3rdparty/libs/armeabi-v7a/libtegra_hal.a b/czxing/opencv/3rdparty/libs/armeabi-v7a/libtegra_hal.a
diff --git a/czxing/opencv/libs/arm64-v8a/libopencv_core.a b/czxing/opencv/libs/arm64-v8a/libopencv_core.a
diff --git a/czxing/opencv/libs/arm64-v8a/libopencv_imgcodecs.a b/czxing/opencv/libs/arm64-v8a/libopencv_imgcodecs.a
diff --git a/czxing/opencv/libs/arm64-v8a/libopencv_imgproc.a b/czxing/opencv/libs/arm64-v8a/libopencv_imgproc.a
diff --git a/czxing/opencv/libs/armeabi-v7a/libopencv_core.a b/czxing/opencv/libs/armeabi-v7a/libopencv_core.a
diff --git a/czxing/opencv/libs/armeabi-v7a/libopencv_imgcodecs.a b/czxing/opencv/libs/armeabi-v7a/libopencv_imgcodecs.a
diff --git a/czxing/opencv/libs/armeabi-v7a/libopencv_imgproc.a b/czxing/opencv/libs/armeabi-v7a/libopencv_imgproc.a
diff --git a/czxing/src/main/cpp/CMakeLists.txt b/czxing/src/main/cpp/CMakeLists.txt
@@ -2,24 +2,51 @@ cmake_minimum_required(VERSION 3.4.1)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -std=c++11 -pthread ")
 
 add_library(
-        zxing-lib
+        zxing
         SHARED
         native-lib.cpp JNIUtils.cpp QRCodeRecognizer.cpp ImageUtil.cpp)
 
 add_subdirectory(zxing)
 include_directories(zxing)
 
 include_directories(include)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
+
+# 静态方式导入库
+add_library(opencv_core STATIC IMPORTED)
+add_library(opencv_imgcodecs STATIC IMPORTED)
+add_library(opencv_imgproc STATIC IMPORTED)
+
+add_library(cpufeatures STATIC IMPORTED)
+add_library(tbb STATIC IMPORTED)
+add_library(tegra_hal STATIC IMPORTED)
+
+# 设置库路径
+set_target_properties(opencv_core PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_core.a)
+set_target_properties(opencv_imgcodecs PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_imgcodecs.a)
+set_target_properties(opencv_imgproc PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_imgproc.a)
+
+set_target_properties(cpufeatures PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libcpufeatures.a)
+set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtbb.a)
+set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtegra_hal.a)
 
 find_library(
         log-lib
         log)
 
 target_link_libraries(
-        zxing-lib
-        jnigraphics
+        zxing
         ZXingCore
-        opencv_java4
+
+        opencv_imgcodecs
+        opencv_imgproc
+        opencv_core
+
+        cpufeatures
+        tbb
+        tegra_hal
+
+        jnigraphics
         android
+        z
         ${log-lib})
diff --git a/czxing/src/main/cpp/JNIUtils.cpp b/czxing/src/main/cpp/JNIUtils.cpp
@@ -110,7 +110,7 @@ bool AnalysisBrightness(JNIEnv *env, const jbyte *bytes, int width, int height)
     // 平均亮度
     long cameraLight = pixelLightCount / (pixelCount / step);
     bool isDarkEnv = false;
-    LOGE("平均亮度 %ld", cameraLight);
+//    LOGE("平均亮度 %ld", cameraLight);
     // 判断在时间范围 AMBIENT_BRIGHTNESS_WAIT_SCAN_TIME * lightSize 内是不是亮度过暗
     if (cameraLight < 60) {
         isDarkEnv = true;

diff --git a/czxing/src/main/java/me/devilsen/czxing/BarcodeReader.java b/czxing/src/main/java/me/devilsen/czxing/BarcodeReader.java
@@ -132,7 +132,7 @@ protected void finalize() throws Throwable {
     public static native boolean analysisBrightnessNative(byte[] bytes, int width, int height);
 
     static {
-        System.loadLibrary("zxing-lib");
+        System.loadLibrary("zxing");
     }
 
 }
diff --git a/czxing/src/main/java/me/devilsen/czxing/BarcodeWriter.java b/czxing/src/main/java/me/devilsen/czxing/BarcodeWriter.java
@@ -115,7 +115,7 @@ private Bitmap write(String text, int width, int height, int color, BarcodeForma
     public static native int writeCode(String content, int width, int height, int color, String format, Object[] result);
 
     static {
-        System.loadLibrary("zxing-lib");
+        System.loadLibrary("zxing");
     }
 
 }