react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/XzHandler.h

@@ -1,7 +1,7 @@
 // XzHandler.h
 
-#ifndef ZIP7_INC_XZ_HANDLER_H
-#define ZIP7_INC_XZ_HANDLER_H
+#ifndef __XZ_HANDLER_H
+#define __XZ_HANDLER_H
 
 namespace NArchive {
 namespace NXz {

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Asm.mak

@@ -1,11 +1,8 @@
 !IFDEF ASM_OBJS
-!IF "$(PLATFORM)" == "arm64"
-$(ASM_OBJS): ../../../../Asm/arm64/$(*B).S
-	$(COMPL_ASM_CLANG)
-!ELSEIF "$(PLATFORM)" == "arm"
-$(ASM_OBJS): ../../../../Asm/arm/$(*B).asm
+!IF "$(CPU)" == "ARM"
+$(ASM_OBJS): ../../../../Asm/Arm/$(*B).asm
 	$(COMPL_ASM)
-!ELSEIF "$(PLATFORM)" != "ia64" && "$(PLATFORM)" != "mips"
+!ELSEIF "$(CPU)" != "IA64" && "$(CPU)" != "MIPS" && "$(CPU)" != "ARM64"
 $(ASM_OBJS): ../../../../Asm/x86/$(*B).asm
 	$(COMPL_ASM)
 !ENDIF

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp

@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gr /MT /W4 /WX /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "Z7_LARGE_PAGES" /D "Z7_DEVICE_FILE" /FAcs /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gr /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "_7ZIP_LARGE_PAGES" /D "SUPPORT_DEVICE_FILE" /FAc /Yu"StdAfx.h" /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gr /MDd /W4 /WX /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "Z7_LARGE_PAGES" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gr /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "_7ZIP_LARGE_PAGES" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -93,8 +93,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "ReleaseU"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Yu"StdAfx.h" /FD /c
-# ADD CPP /nologo /Gr /MD /W4 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "Z7_LARGE_PAGES" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gr /MD /W4 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "_7ZIP_LARGE_PAGES" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -120,8 +120,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DebugU"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
-# ADD CPP /nologo /Gr /MDd /W4 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "Z7_LARGE_PAGES" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gr /MDd /W4 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "_7ZIP_LARGE_PAGES" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -144,6 +144,10 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\UI\Console\ArError.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\UI\Console\BenchCon.cpp
 # End Source File
 # Begin Source File
@@ -266,14 +270,6 @@ SOURCE=..\..\..\Common\CommandLineParser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Common0.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\ComTry.h
 # End Source File
 # Begin Source File
@@ -294,14 +290,6 @@ SOURCE=..\..\..\Common\DynamicBuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\DynLimBuf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\DynLimBuf.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\IntToString.cpp
 # End Source File
 # Begin Source File
@@ -318,18 +306,6 @@ SOURCE=..\..\..\Common\ListFileUtils.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\LzFindPrepare.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyBuffer2.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
@@ -346,10 +322,6 @@ SOURCE=..\..\..\Common\MyInitGuid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\MyLinux.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
@@ -358,10 +330,6 @@ SOURCE=..\..\..\Common\MyString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\MyTypes.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyUnknown.h
 # End Source File
 # Begin Source File
@@ -374,18 +342,6 @@ SOURCE=..\..\..\Common\MyVector.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\MyVersion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyWindows.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -394,10 +350,6 @@ SOURCE=..\..\..\Common\NewHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Sha256Prepare.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\Sha256Reg.cpp
 # End Source File
 # Begin Source File
@@ -550,10 +502,6 @@ SOURCE=..\..\..\Windows\MemoryLock.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\NtCheck.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
@@ -570,15 +518,7 @@ SOURCE=..\..\..\Windows\PropVariantConv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\Registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\SecurityUtils.h
+SOURCE=..\..\..\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
 
@@ -594,14 +534,6 @@ SOURCE=..\..\..\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\SystemInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\SystemInfo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\Thread.h
 # End Source File
 # Begin Source File
@@ -706,14 +638,6 @@ SOURCE=..\..\Common\MethodProps.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\MultiOutStream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\MultiOutStream.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Common\OffsetStream.cpp
 # End Source File
 # Begin Source File
@@ -834,6 +758,10 @@ SOURCE=..\..\Compress\ByteSwap.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compress\ByteSwap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Compress\CopyCoder.cpp
 # End Source File
 # Begin Source File
@@ -1146,10 +1074,6 @@ SOURCE=..\..\UI\Common\DefaultName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\UI\Common\DirItem.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\UI\Common\EnumDirItems.cpp
 # End Source File
 # Begin Source File
@@ -1158,10 +1082,6 @@ SOURCE=..\..\UI\Common\EnumDirItems.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\UI\Common\ExitCode.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\UI\Common\Extract.cpp
 # End Source File
 # Begin Source File
@@ -1286,7 +1206,7 @@ SOURCE=..\..\ICoder.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\IDecl.h
+SOURCE=..\..\IMyUnknown.h
 # End Source File
 # Begin Source File
 
@@ -1313,6 +1233,34 @@ SOURCE=..\..\PropID.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\..\..\C\Sha256.c
+
+!IF  "$(CFG)" == "Alone - Win32 Release"
+
+# ADD CPP /O2
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Sha256.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\Xz.c
 
 !IF  "$(CFG)" == "Alone - Win32 Release"
@@ -1509,18 +1457,6 @@ SOURCE=..\..\..\..\C\7zStream.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\7zTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\7zVersion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Aes.c
 
 !IF  "$(CFG)" == "Alone - Win32 Release"
@@ -1635,26 +1571,7 @@ SOURCE=..\..\..\..\C\Bcj2Enc.c
 # Begin Source File
 
 SOURCE=..\..\..\..\C\Bra.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
@@ -1672,10 +1589,6 @@ SOURCE=..\..\..\..\C\BraIA64.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Compiler.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\CpuArch.c
 
 !IF  "$(CFG)" == "Alone - Win32 Release"
@@ -1764,30 +1677,6 @@ SOURCE=..\..\..\..\C\LzFindMt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\LzFindOpt.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h
 # End Source File
 # Begin Source File
@@ -1973,81 +1862,16 @@ SOURCE=..\..\..\..\C\MtDec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Precomp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\RotateDefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Sha256.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Sha256.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Sha256Opt.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\SwapBytes.c
-
-!IF  "$(CFG)" == "Alone - Win32 Release"
-
-# ADD CPP /O2
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 ReleaseU"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "Alone - Win32 DebugU"
-
+SOURCE=..\..\..\..\C\Threads.c
 # SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\SwapBytes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Threads.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\..\..\C\Threads.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Threads.h
+SOURCE=..\..\..\..\C\Types.h
 # End Source File
 # End Group
 # Begin Group "Crypto"
@@ -2075,10 +1899,6 @@ SOURCE=..\..\Crypto\MyAes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Crypto\MyAesReg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Crypto\RandGen.cpp
 # End Source File
 # Begin Source File

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Alone7z/makefile

@@ -1,23 +1,13 @@
 PROG = 7zr.exe
-
-# USE_C_AES = 1
-# USE_C_SHA = 1
-# USE_C_CRC64 = 1
-# USE_C_CRC = 1
-# NO_ASM_GNU=1
-# NO_ASM=1
-
-CFLAGS = $(CFLAGS) -DZ7_PROG_VARIANT_R
-# CONSOLE_VARIANT_FLAGS=-DZ7_PROG_VARIANT_R
+CFLAGS = $(CFLAGS) \
+  -DPROG_VARIANT_R \
 
 COMMON_OBJS = \
   $O\CommandLineParser.obj \
   $O\CRC.obj \
   $O\CrcReg.obj \
-  $O\DynLimBuf.obj \
   $O\IntToString.obj \
   $O\ListFileUtils.obj \
-  $O\LzFindPrepare.obj \
   $O\NewHandler.obj \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
@@ -43,9 +33,8 @@ WIN_OBJS = \
   $O\MemoryLock.obj \
   $O\PropVariant.obj \
   $O\PropVariantConv.obj \
-  $O\Registry.obj \
+  $O\Synchronization.obj \
   $O\System.obj \
-  $O\SystemInfo.obj \
   $O\TimeUtils.obj \
 
 7ZIP_COMMON_OBJS = \
@@ -59,7 +48,6 @@ WIN_OBJS = \
   $O\LimitedStreams.obj \
   $O\MethodId.obj \
   $O\MethodProps.obj \
-  $O\MultiOutStream.obj \
   $O\OffsetStream.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
@@ -148,7 +136,8 @@ C_OBJS = \
   $O\LzmaEnc.obj \
   $O\MtCoder.obj \
   $O\MtDec.obj \
-  $O\SwapBytes.obj \
+  $O\Sha256.obj \
+  $O\Sort.obj \
   $O\Threads.obj \
   $O\Xz.obj \
   $O\XzDec.obj \
@@ -160,9 +149,6 @@ C_OBJS = \
 !include "../../Aes.mak"
 !include "../../Crc.mak"
 !include "../../Crc64.mak"
-!include "../../LzFindOpt.mak"
 !include "../../LzmaDec.mak"
-!include "../../Sha256.mak"
-!include "../../Sort.mak"
 
 !include "../../7zip.mak"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile

@@ -1,8 +1,8 @@
 PROG = 7zxr.dll
 DEF_FILE = ../../Archive/Archive2.def
 CFLAGS = $(CFLAGS) \
-  -DZ7_EXTRACT_ONLY \
-  -DZ7_NO_CRYPTO
+  -DEXTRACT_ONLY \
+  -D_NO_CRYPTO
 
 COMMON_OBJS = \
   $O\CRC.obj \
@@ -77,7 +77,6 @@ COMPRESS_OBJS = \
   $O\LzmaRegister.obj \
 
 C_OBJS = \
-  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bra.obj \
@@ -89,7 +88,6 @@ C_OBJS = \
   $O\Lzma2DecMt.obj \
   $O\LzmaDec.obj \
   $O\MtDec.obj \
-  $O\SwapBytes.obj \
   $O\Threads.obj \
 
 !include "../../Crc.mak"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/Format7zR/makefile

@@ -1,13 +1,12 @@
 PROG = 7zra.dll
 DEF_FILE = ../../Archive/Archive2.def
 CFLAGS = $(CFLAGS) \
-  -DZ7_NO_CRYPTO
+  -D_NO_CRYPTO
 
 COMMON_OBJS = \
   $O\CRC.obj \
   $O\CrcReg.obj \
   $O\IntToString.obj \
-  $O\LzFindPrepare.obj \
   $O\NewHandler.obj \
   $O\MyString.obj \
   $O\StringConvert.obj \
@@ -23,7 +22,6 @@ WIN_OBJS = \
   $O\PropVariant.obj \
   $O\Synchronization.obj \
   $O\System.obj \
-  $O\TimeUtils.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
@@ -93,7 +91,6 @@ COMPRESS_OBJS = \
   $O\LzmaRegister.obj \
 
 C_OBJS = \
-  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bcj2Enc.obj \
@@ -111,11 +108,9 @@ C_OBJS = \
   $O\LzmaEnc.obj \
   $O\MtCoder.obj \
   $O\MtDec.obj \
-  $O\SwapBytes.obj \
   $O\Threads.obj \
 
 !include "../../Crc.mak"
-!include "../../LzFindOpt.mak"
 !include "../../LzmaDec.mak"
 
 !include "../../7zip.mak"