diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-30 22:11:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-30 22:11:05 +0000 |
| commit | 194b7e0abb447eee2c32bbc26d99000c8a8ea762 (patch) | |
| tree | cf2d6982297b2cf48f9351acde203ab8da2cd579 | |
| parent | ab4307ade3ad8d66f49a27bf75d1a6a972273626 (diff) | |
| parent | 658729bc0290ac05ae59b66bb2eedce3ab99ada2 (diff) | |
| download | gtest-194b7e0abb447eee2c32bbc26d99000c8a8ea762.tar.gz | |
Merge "Revert "Revert "Add libgtest_prod.""" am: 9bf0192
am: 658729b
* commit '658729bc0290ac05ae59b66bb2eedce3ab99ada2':
Revert "Revert "Add libgtest_prod.""
Change-Id: Ie98e31acc1b77095f101c08aec01a8ebdb67bafe
| -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) |