diff options
| author | Ying Wang <wangying@google.com> | 2015-05-27 16:43:12 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-05-27 17:23:38 -0700 |
| commit | 0be0cc6261c8b046529fc3929cee20c007c335d3 (patch) | |
| tree | 2bf882dcbbffaf9f9cdc3a760221b82e455acd97 | |
| parent | 8278ff0722f444fe1e9876f79a33f1a0299c91f8 (diff) | |
| download | gtest-0be0cc6261c8b046529fc3929cee20c007c335d3.tar.gz | |
Allow to build host gtest libraries in unbundled build.
You need to include external/libcxx and external/libcxxabi in the
unbundled branche's repo manifest, though.
Change-Id: I778f36ef941beb932ef28c02188b8c855435b051
(cherry-picked from commit e826aa4f99cf7d9e57fe9668e299a2808674ede4)
| -rw-r--r-- | src/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Android.mk b/src/Android.mk index 7768e30..ec0a3c2 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -75,8 +75,6 @@ LOCAL_MODULE := libgtest_main_ndk include $(BUILD_STATIC_LIBRARY) -# Don't build for unbundled branches -ifeq (,$(TARGET_BUILD_APPS)) ####################################################################### # gtest lib host @@ -108,6 +106,8 @@ LOCAL_ADDRESS_SANITIZER := false include $(BUILD_HOST_STATIC_LIBRARY) ####################################################################### +# Don't build for unbundled branches +ifeq (,$(TARGET_BUILD_APPS)) # gtest lib target include $(CLEAR_VARS) |