commit db071fb781de9b34f7e1a7b081b18fae89f8a7a9
author Daniel Erat <derat@google.com> Tue Sep 08 17:32:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 08 17:32:44 2015 +0000
tree 9e81a67fc2b3755eee8f7e242565701253b42803
parent 777dca1add0c1af9b6f5dd05f6385ae9e8c20e5b
parent 5ab45219a6ad07cc30e6b58fd09371e2a14b93ed

am 5ab45219: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS."

* commit '5ab45219a6ad07cc30e6b58fd09371e2a14b93ed':
  Set LOCAL_EXPORT_C_INCLUDE_DIRS.

src/Android.mk

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 @@
   $(LOCAL_PATH)/.. \
   $(LOCAL_PATH)/../include \
 
+libgtest_export_include_dirs := \
+  $(LOCAL_PATH)/../include
+
 libgtest_cflags := \
   -Wno-missing-field-initializers \
 
@@ -53,6 +56,7 @@
 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_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_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_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_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_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