diff options
Diffstat (limited to 'android/build/binary.make')
-rw-r--r-- | android/build/binary.make | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android/build/binary.make b/android/build/binary.make index f6542dc..3bc4fe9 100644 --- a/android/build/binary.make +++ b/android/build/binary.make @@ -25,6 +25,8 @@ LOCAL_GENERATED_C_SOURCES := $(filter %.c,$(LOCAL_GENERATED_SOURCES)) LOCAL_CXX_SOURCES := $(filter %$(LOCAL_CPP_EXTENSION),$(LOCAL_SRC_FILES) $(LOCAL_GENERATED_SOURCES)) LOCAL_OBJC_SOURCES := $(filter %.m,$(LOCAL_SRC_FILES) $(LOCAL_GENERATED_SOURCES)) +LOCAL_CFLAGS := $(strip $(patsubst %,-I%,$(LOCAL_C_INCLUDES)) $(LOCAL_CFLAGS)) + $(foreach src,$(LOCAL_C_SOURCES), \ $(eval $(call compile-c-source,$(src))) \ ) @@ -41,4 +43,7 @@ $(foreach src,$(LOCAL_OBJC_SOURCES), \ $(eval $(call compile-objc-source,$(src))) \ ) +# Ensure that we build all generated sources before the objects +$(LOCAL_OBJECTS): | $(LOCAL_GENERATED_SOURCES) + CLEAN_OBJS_DIRS += $(LOCAL_OBJS_DIR) |