commit 1c7cf0400b5fd28491d2d670ac4482120542ce4b
author Dan Albert <danalbert@google.com> Tue Sep 16 00:06:17 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 16 00:06:17 2014 +0000
tree 1c005d7b4538489e52f3b40e78cc519b4d23253f
parent a0f99286d0909f7a30b0bee742bec2a0b62c4dd0
parent 45b6545dbf7e7cca48b98d9b4b982431d281ddcd

Merge "Fix include ordering."

Android.mk

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 @@
 	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)