diff options
Diffstat (limited to 'android/build')
| -rw-r--r-- | android/build/definitions.make | 1 | ||||
| -rw-r--r-- | android/build/host_executable.make | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/android/build/definitions.make b/android/build/definitions.make index c4183ea..fd1dd63 100644 --- a/android/build/definitions.make +++ b/android/build/definitions.make @@ -54,6 +54,7 @@ define compile-c-source SRC:=$(1) OBJ:=$$(LOCAL_OBJS_DIR)/$$(SRC:%.c=%.o) LOCAL_OBJECTS += $$(OBJ) +DEPENDENCY_DIRS += $$(dir $$(OBJ)) $$(OBJ): PRIVATE_CFLAGS := $$(CFLAGS) $$(LOCAL_CFLAGS) -I$$(LOCAL_PATH) -I$$(OBJS_DIR) $$(OBJ): PRIVATE_CC := $$(LOCAL_CC) $$(OBJ): PRIVATE_OBJ := $$(OBJ) diff --git a/android/build/host_executable.make b/android/build/host_executable.make index a9b51d8..62f4762 100644 --- a/android/build/host_executable.make +++ b/android/build/host_executable.make @@ -14,22 +14,20 @@ # # first, call a library containing all object files -include $(BUILD_HOST_STATIC_LIBRARY) - -# now, link the executable with it -LOCAL_BUILT_LIBRARY := $(LOCAL_BUILT_MODULE) LOCAL_BUILT_MODULE := $(call executable-path,$(LOCAL_MODULE)) +LOCAL_CC ?= $(CC) +include $(BUILD_SYSTEM)/binary.make LOCAL_LDLIBS := $(foreach lib,$(LOCAL_STATIC_LIBRARIES),$(call library-path,$(lib))) $(LOCAL_LDLIBS) $(LOCAL_BUILT_MODULE): PRIVATE_LDFLAGS := $(LDFLAGS) $(LOCAL_LDFLAGS) $(LOCAL_BUILT_MODULE): PRIVATE_LDLIBS := $(LOCAL_LDLIBS) -$(LOCAL_BUILT_MODULE): PRIVATE_LIBRARY := $(LOCAL_BUILT_LIBRARY) +$(LOCAL_BUILT_MODULE): PRIVATE_OBJS := $(LOCAL_OBJECTS) -$(LOCAL_BUILT_MODULE): $(LOCAL_BUILT_LIBRARY) +$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS) @ mkdir -p $(dir $@) @ echo "Executable: $@" - $(hide) $(LD) $(PRIVATE_LDFLAGS) -o $@ $(PRIVATE_LIBRARY) $(PRIVATE_LDLIBS) + $(hide) $(LD) $(PRIVATE_LDFLAGS) -o $@ $(PRIVATE_LIBRARY) $(PRIVATE_OBJS) $(PRIVATE_LDLIBS) EXECUTABLES += $(LOCAL_BUILT_MODULE) $(LOCAL_BUILT_MODULE): $(foreach lib,$(LOCAL_STATIC_LIBRARIES),$(call library-path,$(lib))) |