aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-03-16 20:21:58 +0000
committerDan Albert <danalbert@google.com>2016-03-16 20:21:58 +0000
commitbaa71b273e408ee0401c87792507ef6d188593a6 (patch)
treee3e231ef55853ad5c01e001c5e7d7f3d91a27d63
parent18d1e9ca582db6db2fcf64876b0d59e47a026adc (diff)
downloadgtest-baa71b273e408ee0401c87792507ef6d188593a6.tar.gz
Revert "Add libgtest_prod."
Darwin doesn't support our implementation of header only static libraries. Reverting to fix the build until we find a solution. This reverts commit 18d1e9ca582db6db2fcf64876b0d59e47a026adc. Change-Id: I5c878280b909dd7c1649b3f4a3c090d10d046046
-rw-r--r--src/Android.mk14
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)