aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Wiley <wiley@google.com>2015-07-24 16:27:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-07-24 16:27:55 +0000
commit7c90006054e868c645be41dcfbe551be4382f69d (patch)
treeb26cd78e76bcb929189fb33334907c5fc5507339
parent211806ade546b5e3ca3cc320796fe9983ec5ea1e (diff)
parentcb82b67ddf703999b7385c7f9724400e38c76cef (diff)
downloadgmock-7c90006054e868c645be41dcfbe551be4382f69d.tar.gz
Merge "Export gmock headers"
-rw-r--r--src/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 00c119d..a36d50c 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -53,6 +53,7 @@ LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_CPPFLAGS := -std=c++11
LOCAL_C_FLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_ndk
@@ -71,6 +72,7 @@ LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_CPPFLAGS := -std=c++11
LOCAL_C_FLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main_ndk
@@ -88,6 +90,7 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_host_includes)
LOCAL_C_FLAGS += $(libgmock_cflags)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_MODULE := libgmock_host
LOCAL_MULTILIB := both
LOCAL_SANITIZE := never
@@ -103,6 +106,7 @@ LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_host_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_C_FLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main_host
LOCAL_MULTILIB := both
@@ -119,6 +123,7 @@ LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock
LOCAL_SANITIZE := never
@@ -133,6 +138,7 @@ include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main
LOCAL_SANITIZE := never