diff --git a/LICENSE b/LICENSE index 7f2614c5..c0defc05 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ he MIT License (MIT) -Copyright (c) 2015 TzuTaLin +Copyright (c) 2015-2016 TzuTaLin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/jni/Android.mk b/jni/Android.mk index 58e7bfb1..625a1305 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -24,9 +24,6 @@ EXT_INSTALL_PATH = $(TOP_LEVEL_PATH)/third_party OPENCV_PATH = $(EXT_INSTALL_PATH)/opencv/jni OPENCV_INCLUDE_DIR = $(OPENCV_PATH)/include -MINI_GLOG_PATH = $(EXT_INSTALL_PATH)/miniglog -MINI_GLOG_INCLUDE_DIR = $(MINI_GLOG_PATH) - ### Test daemon #==========================svm_ex=================================== include $(CLEAR_VARS) @@ -64,5 +61,8 @@ LOCAL_LDFLAGS += -pie -fPIE include $(BUILD_EXECUTABLE) #============================svr_ex================================ +MINIGLOG_LIB_TYPE := STATIC +MINI_GLOG_PATH = $(EXT_INSTALL_PATH)/miniglog +include $(MINI_GLOG_PATH)/Android.mk include $(SUB_MK_FILES) diff --git a/jni/jnilib_ex/Android.mk b/jni/jnilib_ex/Android.mk index f542e5a0..401e0f30 100644 --- a/jni/jnilib_ex/Android.mk +++ b/jni/jnilib_ex/Android.mk @@ -7,17 +7,12 @@ OPENCV_CAMERA_MODULES := off OPENCV_LIB_TYPE := STATIC include $(OPENCV_PATH)/OpenCV.mk -# import dlib -LOCAL_STATIC_LIBRARIES += dlib - LOCAL_MODULE := people_det LOCAL_C_INCLUDES += \ - $(MINI_GLOG_INCLUDE_DIR) \ $(OPENCV_INCLUDE_DIR) LOCAL_SRC_FILES += \ - $(MINI_GLOG_PATH)/glog/logging.cc \ jni_people_det.cpp \ imageutils_jni.cpp \ common/rgb2yuv.cpp \ @@ -26,6 +21,16 @@ LOCAL_SRC_FILES += \ LOCAL_LDLIBS += -lm -llog -ldl -lz -ljnigraphics LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11 +# import dlib +LOCAL_STATIC_LIBRARIES += dlib + +### import miniglog +ifeq ($(MINIGLOG_LIB_TYPE),SHARED) + LOCAL_SHARED_LIBRARIES += miniglog +else + LOCAL_STATIC_LIBRARIES += miniglog +endif + ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) LOCAL_ARM_MODE := arm LOCAL_ARM_NEON := true diff --git a/jni/other_daemon_ex/Android.mk b/jni/other_daemon_ex/Android.mk index ec597fa1..4faef2cf 100644 --- a/jni/other_daemon_ex/Android.mk +++ b/jni/other_daemon_ex/Android.mk @@ -51,9 +51,9 @@ LOCAL_SRC_FILES := face_landmark_detection_ex.cpp LOCAL_LDLIBS := -lm -llog -ldl -lz LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11 -LOCAL_ARM_MODE := arm ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) -LOCAL_ARM_NEON := true + LOCAL_ARM_MODE := arm + LOCAL_ARM_NEON := true endif LOCAL_CFLAGS += -pie -fPIE diff --git a/third_party/miniglog b/third_party/miniglog index b5779400..e51c9411 160000 --- a/third_party/miniglog +++ b/third_party/miniglog @@ -1 +1 @@ -Subproject commit b57794004929abf2ce5a92b2ac8b4786a05bcd7e +Subproject commit e51c9411a970186d57c34ba7139c4b3bf6e86465