diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-30 21:12:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-30 21:12:38 +0000 |
| commit | 658729bc0290ac05ae59b66bb2eedce3ab99ada2 (patch) | |
| tree | e428ea5adfb457b88bbbcb39c5ddfe9f9b8358ea | |
| parent | 6ab460936e7ffb913a72016403c97bfaf0e9df90 (diff) | |
| parent | 9bf0192fe4271426b18229de49f6ad098e54ef30 (diff) | |
| download | gtest-658729bc0290ac05ae59b66bb2eedce3ab99ada2.tar.gz | |
Merge "Revert "Revert "Add libgtest_prod."""
am: 9bf0192
* commit '9bf0192fe4271426b18229de49f6ad098e54ef30':
Revert "Revert "Add libgtest_prod.""
Change-Id: I979cedf4c21d487ea71c143d2a291158f996cb6d
| -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) |