Skip to content

Commit

Permalink
revise build.py and mk
Browse files Browse the repository at this point in the history
  • Loading branch information
darren_lin committed Oct 17, 2016
1 parent b48fe07 commit bd06003
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 104 deletions.
15 changes: 11 additions & 4 deletions build.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
import sys
import argparse
from distutils.dir_util import copy_tree
import shutil
import subprocess
from subprocess import Popen, PIPE

Expand Down Expand Up @@ -105,13 +105,16 @@ def test():
subprocess.call(['adb', 'shell', './data/local/tmp/face_landmark', '/data/local/tmp/shape_predictor_68_face_landmarks.dat', '/data/local/tmp/lena.bmp'])

def copytree(src, dst, symlinks=False, ignore=None):
if not os.path.exists(dst):
os.makedirs(dst)
for item in os.listdir(src):
s = os.path.join(src, item)
d = os.path.join(dst, item)
if os.path.isdir(s):
copy_tree(s, d, symlinks, ignore)
copytree(s, d, symlinks, ignore)
else:
print 'Copy errors'
if not os.path.exists(d) or os.stat(s).st_mtime - os.stat(d).st_mtime > 1:
shutil.copy2(s, d)

if __name__ == '__main__':
# Move to top-level
Expand All @@ -124,12 +127,16 @@ def copytree(src, dst, symlinks=False, ignore=None):
setDeviceABI()

args = parse_args()

if args.test:
os.environ['Test'] = "true"

if args.clean:
ndk_clean()
else:
ndk_build(args)

if args.android_project:
if args.android_project and os.path.exists(args.android_project):
srcFolder = os.path.join('libs')
copytree(srcFolder, args.android_project)

Expand Down
37 changes: 0 additions & 37 deletions jni/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,6 @@ EXT_INSTALL_PATH = $(TOP_LEVEL_PATH)/third_party
OPENCV_PATH = $(EXT_INSTALL_PATH)/opencv/jni
OPENCV_INCLUDE_DIR = $(OPENCV_PATH)/include

### Test daemon
#==========================svm_ex===================================
include $(CLEAR_VARS)
LOCAL_MODULE := svm_ex
LOCAL_SRC_FILES := dlib/examples/svm_ex.cpp
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE
include $(BUILD_EXECUTABLE)
#==========================svm_ex===================================


#====================max_cost_assignment_ex=========================
include $(CLEAR_VARS)
LOCAL_MODULE := max_cost_assignment_ex
LOCAL_SRC_FILES := dlib/examples/max_cost_assignment_ex.cpp
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11
LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE
include $(BUILD_EXECUTABLE)
#====================max_cost_assignment_ex=========================


#============================svr_ex================================
include $(CLEAR_VARS)
LOCAL_MODULE := svr_ex
LOCAL_SRC_FILES := dlib/examples/svr_ex.cpp
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11
LOCAL_CFLAGS += -pie -fPIE
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
Expand Down
169 changes: 106 additions & 63 deletions jni/other_daemon_ex/Android.mk
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,107 @@
LOCAL_PATH := $(call my-dir)

# C++ TestSelectiveSearch
# =======================================================
include $(CLEAR_VARS)
OpenCV_INSTALL_MODULES := on
OPENCV_CAMERA_MODULES := off
OPENCV_LIB_TYPE := STATIC
include $(OPENCV_PATH)/OpenCV.mk

LOCAL_MODULE := TestSelectiveSearch

LOCAL_C_INCLUDES += $(OPENCV_INCLUDE_DIR)

# import dlib
LOCAL_STATIC_LIBRARIES += dlib

LOCAL_SRC_FILES := TestSelectiveSearch.cpp

LOCAL_LDLIBS := -lm -llog -ldl -lz
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_ARM_MODE := arm
LOCAL_ARM_NEON := true
endif

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE

include $(BUILD_EXECUTABLE)
#-----------------------------------------------------------------------------

# C++ face_landmark
# =======================================================
include $(CLEAR_VARS)
OpenCV_INSTALL_MODULES := on
OPENCV_CAMERA_MODULES := off
OPENCV_LIB_TYPE := STATIC
include $(OPENCV_PATH)/OpenCV.mk

LOCAL_MODULE := face_landmark

# import dlib
LOCAL_STATIC_LIBRARIES += dlib

LOCAL_C_INCLUDES += $(OPENCV_INCLUDE_DIR)

LOCAL_SRC_FILES := face_landmark_detection_ex.cpp

LOCAL_LDLIBS := -lm -llog -ldl -lz
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_ARM_MODE := arm
LOCAL_ARM_NEON := true
CURRENT_ABS_FOLDER_PATH = /$(patsubst /%,%,$(subst $($(abspath $(USER_LOCAL_PATH))),,$(abspath $1)))
USER_LOCAL_PATH:=$(LOCAL_PATH)
THIS_LOCAL_ABS_PATH := $(call CURRENT_ABS_FOLDER_PATH, $(call my-dir))
LOCAL_PATH:=$(subst ?,,$(firstword ?$(subst \, ,$(subst /, , $(abspath $(call my-dir))))))

ifeq ($(Test),true)
LOCAL_PATH := $(call my-dir)

# C++ TestSelectiveSearch
# =======================================================
include $(CLEAR_VARS)
OpenCV_INSTALL_MODULES := on
OPENCV_CAMERA_MODULES := off
OPENCV_LIB_TYPE := STATIC
include $(OPENCV_PATH)/OpenCV.mk

LOCAL_MODULE := TestSelectiveSearch

LOCAL_C_INCLUDES += $(OPENCV_INCLUDE_DIR)

# import dlib
LOCAL_STATIC_LIBRARIES += dlib

LOCAL_SRC_FILES := TestSelectiveSearch.cpp

LOCAL_LDLIBS := -lm -llog -ldl -lz
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_ARM_MODE := arm
LOCAL_ARM_NEON := true
endif

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE

include $(BUILD_EXECUTABLE)
#-----------------------------------------------------------------------------

# C++ face_landmark
# =======================================================
include $(CLEAR_VARS)
OpenCV_INSTALL_MODULES := on
OPENCV_CAMERA_MODULES := off
OPENCV_LIB_TYPE := STATIC
include $(OPENCV_PATH)/OpenCV.mk

LOCAL_MODULE := face_landmark

# import dlib
LOCAL_STATIC_LIBRARIES += dlib

LOCAL_C_INCLUDES += $(OPENCV_INCLUDE_DIR)

LOCAL_SRC_FILES := face_landmark_detection_ex.cpp

LOCAL_LDLIBS := -lm -llog -ldl -lz
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_ARM_MODE := arm
LOCAL_ARM_NEON := true
endif

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE

include $(BUILD_EXECUTABLE)
#-----------------------------------------------------------------------------

### Test daemon
#==========================svm_ex===================================
include $(CLEAR_VARS)
LOCAL_MODULE := svm_ex
LOCAL_SRC_FILES := $(THIS_LOCAL_ABS_PATH)/../dlib/examples/svm_ex.cpp
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE
include $(BUILD_EXECUTABLE)
#==========================svm_ex===================================
$(info $(Test))
#====================max_cost_assignment_ex=========================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(THIS_LOCAL_ABS_PATH)/../dlib/examples/max_cost_assignment_ex.cpp
LOCAL_MODULE := max_cost_assignment_ex
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11
LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE
include $(BUILD_EXECUTABLE)
#====================max_cost_assignment_ex=========================

#============================svr_ex================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(THIS_LOCAL_ABS_PATH)/../dlib/examples/svr_ex.cpp
LOCAL_MODULE := svr_ex
LOCAL_STATIC_LIBRARIES := dlib
LOCAL_CPPFLAGS += -fexceptions -frtti -std=c++11
LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE
include $(BUILD_EXECUTABLE)
#============================svr_ex================================
else
$(info "Won't build test's executable file")
endif

LOCAL_CFLAGS += -pie -fPIE
LOCAL_LDFLAGS += -pie -fPIE

include $(BUILD_EXECUTABLE)
#-----------------------------------------------------------------------------

0 comments on commit bd06003

Please sign in to comment.