diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index a7ec6de1c..52be69fd5 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -3,10 +3,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := application +APPDIR := $(shell readlink $(LOCAL_PATH)/src) -APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/ -type d)) +APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/$(APPDIR) -type d)) ifneq ($(APPLICATION_SUBDIRS_BUILD),) -APP_SUBDIRS := $(APPLICATION_SUBDIRS_BUILD) +APP_SUBDIRS := $(addprefix $(APPDIR)/,$(APPLICATION_SUBDIRS_BUILD)) endif LOCAL_CFLAGS := @@ -42,7 +43,6 @@ LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS) LOCAL_CPP_EXTENSION := .cpp LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp)))) -# Uncomment to also add C sources LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c)))) ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)