From 45b6545dbf7e7cca48b98d9b4b982431d281ddcd Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 15 Sep 2014 16:48:15 -0700 Subject: Fix include ordering. LOCAL_CFLAGS get placed after LOCAL_C_INCLUDES on the command line, so they cannot override built in include paths. Change-Id: Iff7c8c15d2965e95279380f5555d5076bf3b9ae8 --- Android.mk | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/Android.mk b/Android.mk index 1d2f735..447a8d8 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,8 @@ LOCAL_PATH:= $(call my-dir) -libgabi++_cflags := \ - -I$(LOCAL_PATH)/include +libgabi++_c_includes := \ + $(LOCAL_PATH)/include \ + bionic/libstdc++/include \ libgabi++_common_src_files := \ src/array_type_info.cc \ @@ -19,37 +20,23 @@ libgabi++_common_src_files := \ src/vmi_class_type_info.cc include $(CLEAR_VARS) - +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional - LOCAL_CPP_EXTENSION := .cc - LOCAL_SRC_FILES:= $(libgabi++_common_src_files) - LOCAL_MODULE:= libgabi++ - -LOCAL_CFLAGS := $(libgabi++_cflags) - +LOCAL_C_INCLUDES := $(libgabi++_c_includes) LOCAL_RTTI_FLAG := -frtti - LOCAL_SYSTEM_SHARED_LIBRARIES := libc - include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) - +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional - LOCAL_CPP_EXTENSION := .cc - LOCAL_SRC_FILES:= $(libgabi++_common_src_files) - LOCAL_MODULE:= libgabi++ - -LOCAL_CFLAGS := $(libgabi++_cflags) - +LOCAL_C_INCLUDES := $(libgabi++_c_includes) LOCAL_RTTI_FLAG := -frtti - LOCAL_SYSTEM_SHARED_LIBRARIES := libc - include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3