diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-30 11:39:51 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-03-30 11:39:56 -0700 |
| commit | 87cecf0fda93d1e8bbc6268daf620b4b291c3006 (patch) | |
| tree | e428ea5adfb457b88bbbcb39c5ddfe9f9b8358ea | |
| parent | 6ab460936e7ffb913a72016403c97bfaf0e9df90 (diff) | |
| download | gtest-87cecf0fda93d1e8bbc6268daf620b4b291c3006.tar.gz | |
Revert "Revert "Add libgtest_prod.""
The Mac build supports header only libraries now.
This reverts commit baa71b273e408ee0401c87792507ef6d188593a6.
Bug: http://b/16574165
Change-Id: I08ab68f3504cbd43dad995c1aa248412af8576a7
| -rw-r--r-- | src/Android.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index e2b4e79..7d502c3 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -226,3 +226,17 @@ LOCAL_SANITIZE := never include $(BUILD_STATIC_LIBRARY) endif + +# Header only libraries for modules that need gtest_prod.h. Libraries exporting +# public headers that use gtest_prod.h should pull this in with +# LOCAL_WHOLE_STATIC_LIBRARIES so that their users will also get the include +# paths. +include $(CLEAR_VARS) +LOCAL_MODULE := libgtest_prod +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libgtest_prod +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libgtest_export_include_dirs) +include $(BUILD_HOST_STATIC_LIBRARY) |