diff options
| author | Ying Wang <wangying@google.com> | 2015-05-28 00:25:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-28 00:25:06 +0000 |
| commit | ae65c436cada904c8ac1996a445ec5da66cc129e (patch) | |
| tree | 2bf882dcbbffaf9f9cdc3a760221b82e455acd97 | |
| parent | 8278ff0722f444fe1e9876f79a33f1a0299c91f8 (diff) | |
| parent | 0be0cc6261c8b046529fc3929cee20c007c335d3 (diff) | |
| download | gtest-ae65c436cada904c8ac1996a445ec5da66cc129e.tar.gz | |
Merge "Allow to build host gtest libraries in unbundled build."gradle_1.3.0-beta3gradle_1.3.0-beta2studio-1.4-release
| -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) |