update lib ApkDiffPatch; fixed some bug & support lzma2 & optimize patch speed on arm64;

Author: sisong

ApkDiffPatch

@@ -72,10 +72,10 @@
 		</Unit>
 		<Unit filename="../../../ApkDiffPatch/HDiffPatch/libParallel/parallel_channel.cpp" />
 		<Unit filename="../../../ApkDiffPatch/HDiffPatch/libParallel/parallel_import.cpp" />
-		<Unit filename="../../../ApkDiffPatch/lzma/C/LzFind.c">
+		<Unit filename="../../../ApkDiffPatch/lzma/C/LzmaDec.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../../ApkDiffPatch/lzma/C/LzmaDec.c">
+		<Unit filename="../../../ApkDiffPatch/lzma/C/Lzma2Dec.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../../ApkDiffPatch/src/patch/NewStream.cpp" />

VirtualApkPatch/builds_test/codeblocks/VirtualApkPatch.cbp

@@ -149,7 +149,7 @@
     <ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libHDiffPatch\HPatch\patch.c" />
     <ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_channel.cpp" />
     <ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_import.cpp" />
-    <ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzFind.c" />
+    <ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\Lzma2Dec.c" />
     <ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzmaDec.c" />
     <ClCompile Include="..\..\..\ApkDiffPatch\src\patch\NewStream.cpp" />
     <ClCompile Include="..\..\..\ApkDiffPatch\src\patch\OldStream.cpp" />

VirtualApkPatch/builds_test/vc/VirtualApkPatch.vcxproj

@@ -253,7 +253,7 @@
 		D65C69BD23293AB300A3C89C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1030;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = sisong;
 				TargetAttributes = {
 					D65C69C423293AB300A3C89C = {
@@ -267,6 +267,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = D65C69BC23293AB300A3C89C;
 			productRefGroup = D65C69C623293AB300A3C89C /* Products */;
@@ -331,6 +332,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -353,6 +355,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -379,7 +382,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -391,6 +394,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = x86_64;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -413,6 +417,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -437,7 +442,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -447,6 +452,7 @@
 		D65C69CD23293AB300A3C89C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -455,6 +461,7 @@
 		D65C69CE23293AB300A3C89C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

VirtualApkPatch/builds_test/xcode/VirtualApkPatch.xcodeproj/project.pbxproj

@@ -5,7 +5,11 @@ LOCAL_MODULE := hotunity
 
 ADP_PATH   := $(LOCAL_PATH)/../../ApkDiffPatch
 
-Lzma_Files := $(ADP_PATH)/lzma/C/LzmaDec.c 
+Lzma_Files := $(ADP_PATH)/lzma/C/LzmaDec.c \
+              $(ADP_PATH)/lzma/C/Lzma2Dec.c
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+  Lzma_Files += $(ADP_PATH)/lzma/Asm/arm64/LzmaDecOpt.S
+endif
 
 ZLIB_PATH  := $(ADP_PATH)/zlib1.2.11
 Zlib_Files := $(ZLIB_PATH)/crc32.c    \
@@ -47,9 +51,13 @@ Src_Files := $(LOCAL_PATH)/../src/hook_unity.cpp \
 
 LOCAL_SRC_FILES  := $(Src_Files) $(xHook_Files) $(Lzma_Files) $(Zlib_Files) $(Hdp_Files) $(Adp_Files)
 
-LOCAL_LDLIBS     := -llog -landroid
-LOCAL_CFLAGS     := -Os -DANDROID_NDK  -DTARGET_ARCH_ABI=\"$(TARGET_ARCH_ABI)\"  \
-                    -D_7ZIP_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1 \
-                    -D_IS_NEED_FIXED_ZLIB_VERSION=1 -D_IS_NEED_VIRTUAL_ZIP=1
+DEF_FLAGS := -O2 -D_7ZIP_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1 \
+             -D_IS_NEED_FIXED_ZLIB_VERSION=1 -D_IS_NEED_VIRTUAL_ZIP=1
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+  DEF_FLAGS += -D_LZMA_DEC_OPT 
+endif
+
+LOCAL_LDLIBS := -llog -landroid
+LOCAL_CFLAGS := -DANDROID_NDK -DTARGET_ARCH_ABI=\"$(TARGET_ARCH_ABI)\" $(DEF_FLAGS)
 
 include $(BUILD_SHARED_LIBRARY)