Merge pull request pytorch#41 from kamgurgul/master

Android NDK 21

jni/Android.mk

@@ -5,12 +5,12 @@ LOCAL_MODULE := cpuinfo
 LOCAL_SRC_FILES := \
 	src/init.c \
 	src/api.c \
-	src/linux/current.c \
+	src/cache.c \
 	src/linux/processors.c \
 	src/linux/smallfile.c \
 	src/linux/multiline.c \
 	src/linux/cpulist.c
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi armeabi-v7a arm64-v8a))
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi-v7a arm64-v8a))
 LOCAL_SRC_FILES += \
 	src/arm/uarch.c \
 	src/arm/cache.c \
@@ -21,16 +21,13 @@ LOCAL_SRC_FILES += \
 	src/arm/linux/midr.c \
 	src/arm/linux/hwcap.c \
 	src/arm/android/properties.c
-ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_SRC_FILES += src/arm/linux/aarch32-isa.c.arm
-endif # armeabi
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_SRC_FILES += src/arm/linux/aarch32-isa.c
 endif # armeabi-v7a
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 LOCAL_SRC_FILES += src/arm/linux/aarch64-isa.c
 endif # arm64-v8a
-endif # armeabi, armeabi-v7a, or arm64-v8a
+endif # armeabi-v7a, or arm64-v8a
 ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64))
 LOCAL_SRC_FILES += \
 	src/x86/init.c \
@@ -64,7 +61,6 @@ endif
 LOCAL_STATIC_LIBRARIES := clog
 include $(BUILD_STATIC_LIBRARY)
 
-
 $(call import-add-path,$(LOCAL_PATH)/deps)
 
 $(call import-module,clog/jni)

jni/Application.mk

@@ -1,4 +1,4 @@
-APP_PLATFORM := android-15
+APP_PLATFORM := android-16
 APP_PIE := true
 APP_STL := c++_static
-APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64