Restore Master after tagging release

Android.mk

@@ -84,7 +84,7 @@ CRYPTOPP_LIB_FILES := $(CRYPTOPP_INIT_FILES) $(CRYPTOPP_LIB_FILES)
 # ARM A-32 source files
 
 ifeq ($(TARGET_ARCH),arm)
-    CRYPTOPP_ARM_FILES := aes_armv4.S
+    CRYPTOPP_ARM_FILES := aes_armv4.S sha1_armv4.S sha256_armv4.S sha512_armv4.S
     CRYPTOPP_LIB_FILES := $(CRYPTOPP_LIB_FILES) $(CRYPTOPP_ARM_FILES)
     LOCAL_ARM_MODE := arm
     LOCAL_FILTER_ASM :=
@@ -111,6 +111,7 @@ endif
 ifeq ($(TARGET_ARCH),arm64)
     CRYPTOPP_LIB_FILES := $(filter-out %avx.cpp,$(CRYPTOPP_LIB_FILES))
     CRYPTOPP_LIB_FILES := $(filter-out sse_simd.cpp,$(CRYPTOPP_LIB_FILES))
+    CRYPTOPP_LIB_FILES := $(filter-out donna_32.cpp,$(CRYPTOPP_LIB_FILES))
     CRYPTOPP_LIB_FILES := $(filter-out donna_sse.cpp,$(CRYPTOPP_LIB_FILES))
 endif
 
@@ -140,14 +141,6 @@ LOCAL_CPPFLAGS := -Wall
 LOCAL_CPP_FEATURES := rtti exceptions
 LOCAL_LDFLAGS := -Wl,--exclude-libs,ALL -Wl,--as-needed
 
-# Clang workarounds for Intel machines
-ifeq ($(TARGET_ARCH),x86)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
-endif
-ifeq ($(TARGET_ARCH),x86_64)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
-endif
-
 LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
 
@@ -164,14 +157,6 @@ LOCAL_SRC_FILES := $(addprefix $(CRYPTOPP_PATH),$(CRYPTOPP_LIB_FILES))
 LOCAL_CPPFLAGS := -Wall
 LOCAL_CPP_FEATURES := rtti exceptions
 
-# Clang workarounds for Intel machines
-ifeq ($(TARGET_ARCH),x86)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
-endif
-ifeq ($(TARGET_ARCH),x86_64)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
-endif
-
 LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..