From d659a1bff8896c4589123d6cade4004e3c09273a Mon Sep 17 00:00:00 2001
From: Kamil Gurgul <kamgurgul@gmail.com>
Date: Sun, 17 May 2020 18:55:49 +0200
Subject: [PATCH] Android fix cleanup

---
 .vscode/settings.json | 7 -------
 jni/Android.mk        | 5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 974b97c9..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
-    "files.associations": {
-        "cpuinfo.h": "c",
-        "typeinfo": "c"
-    }
-}
\ No newline at end of file
diff --git a/jni/Android.mk b/jni/Android.mk
index f66c5f86..2212625a 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -27,7 +27,7 @@ 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 \
@@ -59,8 +59,7 @@ else
 LOCAL_CFLAGS += -DCPUINFO_LOG_LEVEL=0
 endif
 LOCAL_STATIC_LIBRARIES := clog
-# include $(BUILD_STATIC_LIBRARY)
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
 $(call import-add-path,$(LOCAL_PATH)/deps)