From b91418b32f02ceacb035ac103ed079ca5539d463 Mon Sep 17 00:00:00 2001 From: Daniel Erat Date: Tue, 8 Sep 2015 08:56:01 -0600 Subject: Set LOCAL_EXPORT_C_INCLUDE_DIRS. Export the include directory so that code linking against gtest doesn't need to manually specify it. Change-Id: Ie6f645e28212a5f82f59085e142ffc3c7c2d78a4 --- src/Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Android.mk b/src/Android.mk index 5976376..6895fe2 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -36,6 +36,9 @@ libgtest_host_includes := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../include \ +libgtest_export_include_dirs := \ + $(LOCAL_PATH)/../include + libgtest_cflags := \ -Wno-missing-field-initializers \ @@ -53,6 +56,7 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_ndk include $(BUILD_STATIC_LIBRARY) @@ -71,6 +75,7 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_main_ndk include $(BUILD_STATIC_LIBRARY) @@ -84,6 +89,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_host LOCAL_MULTILIB := both LOCAL_SANITIZE := never @@ -100,6 +106,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_main_host LOCAL_MULTILIB := both LOCAL_SANITIZE := never @@ -118,6 +125,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest LOCAL_SANITIZE := never LOCAL_RTTI_FLAG := -frtti @@ -134,6 +142,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) LOCAL_CFLAGS += $(libgtest_cflags) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) LOCAL_MODULE := libgtest_main LOCAL_SANITIZE := never -- cgit v1.2.3