diff options
| author | Kamil Gurgul <kamgurgul@gmail.com> | 2020-05-17 18:55:49 +0200 |
|---|---|---|
| committer | Kamil Gurgul <kamgurgul@gmail.com> | 2020-05-17 18:55:49 +0200 |
| commit | d659a1bff8896c4589123d6cade4004e3c09273a (patch) | |
| tree | 0552a2329361a4f3f068f423492e5de2f9af8fbf | |
| parent | edea24539488b3395bc3c3c049a2ea0f5ccbc7c9 (diff) | |
| download | cpuinfo-d659a1bff8896c4589123d6cade4004e3c09273a.tar.gz | |
Android fix cleanup
| -rw-r--r-- | .vscode/settings.json | 7 | ||||
| -rw-r--r-- | jni/Android.mk | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 974b97c..0000000 --- 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 f66c5f8..2212625 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) |