diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-16 00:06:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-16 00:06:17 +0000 |
| commit | 1c7cf0400b5fd28491d2d670ac4482120542ce4b (patch) | |
| tree | 1c005d7b4538489e52f3b40e78cc519b4d23253f | |
| parent | a0f99286d0909f7a30b0bee742bec2a0b62c4dd0 (diff) | |
| parent | 45b6545dbf7e7cca48b98d9b4b982431d281ddcd (diff) | |
| download | android_abi_cpp-1c7cf0400b5fd28491d2d670ac4482120542ce4b.tar.gz android_abi_cpp-1c7cf0400b5fd28491d2d670ac4482120542ce4b.tar.bz2 android_abi_cpp-1c7cf0400b5fd28491d2d670ac4482120542ce4b.zip | |
Merge "Fix include ordering."
| -rw-r--r-- | Android.mk | 27 |
1 files changed, 7 insertions, 20 deletions
@@ -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) |