diff options
author | Daniel Erat <derat@google.com> | 2015-09-08 17:50:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 17:50:52 +0000 |
commit | 8f573d46209297a734ab5e37e23a3ac72810612d (patch) | |
tree | 91f8c77363dbc7c4b4a39b755ae403ad3cb9b18e | |
parent | 0d5d589f607cc632247c63a164d73687bbd38958 (diff) | |
parent | 27d8d4ea190ba0a7281073713cf7c8966486dcc3 (diff) | |
download | gtest-8f573d46209297a734ab5e37e23a3ac72810612d.tar.gz |
am 27d8d4ea: am db071fb7: am 5ab45219: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS."
* commit '27d8d4ea190ba0a7281073713cf7c8966486dcc3':
Set LOCAL_EXPORT_C_INCLUDE_DIRS.
-rw-r--r-- | src/Android.mk | 9 |
1 files changed, 9 insertions, 0 deletions
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 |