diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-16 20:22:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-16 20:22:25 +0000 |
| commit | 0b16dd0724bd060293712350d1a8030bbeedff11 (patch) | |
| tree | e3e231ef55853ad5c01e001c5e7d7f3d91a27d63 | |
| parent | 385bc12a1941581f6d202b4cfda3e12e48054f6b (diff) | |
| parent | baa71b273e408ee0401c87792507ef6d188593a6 (diff) | |
| download | gtest-0b16dd0724bd060293712350d1a8030bbeedff11.tar.gz | |
Merge "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) |