diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-16 20:32:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-16 20:32:23 +0000 |
| commit | 757ceb7089e2aebc61e6b88e43151509d73968f1 (patch) | |
| tree | 9ed74c027b19fe118fd2f21036d787ce6cd9c632 | |
| parent | b75412a91cb4212fb61a7d1e75e618bc999a329a (diff) | |
| parent | 0b16dd0724bd060293712350d1a8030bbeedff11 (diff) | |
| download | gtest-757ceb7089e2aebc61e6b88e43151509d73968f1.tar.gz | |
Merge "Revert "Add libgtest_prod.""
am: 0b16dd0
* commit '0b16dd0724bd060293712350d1a8030bbeedff11':
Revert "Add libgtest_prod."
| -rw-r--r-- | src/Android.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/Android.mk b/src/Android.mk index 575f229..8763244 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -150,17 +150,3 @@ 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) |