diff options
| author | Spencer Low <CompareAndSwap@gmail.com> | 2015-09-07 23:09:48 -0700 |
|---|---|---|
| committer | Spencer Low <CompareAndSwap@gmail.com> | 2015-09-07 23:09:48 -0700 |
| commit | 7f4fe570b4f3b19c0eda94176ae52b564112c436 (patch) | |
| tree | d805384e5011aa3973f7cb339acb87544f92b006 | |
| parent | 01e30b453ed9de79e9338ff31733e045862273f6 (diff) | |
| download | gtest-7f4fe570b4f3b19c0eda94176ae52b564112c436.tar.gz | |
add gtest to darwin and windows whitelist for adb_test
To build adb_test (from system/core/adb) on Windows, gtest is needed,
thus add libgtest_host and libgtest_main_host to the whitelist for
Windows. Also added to Darwin.
Change-Id: Ia38e18bebe40d0061ffe41015dc86c5973f63281
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
| -rw-r--r-- | src/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index 5976376..0005a0f 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -85,6 +85,7 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_host +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MULTILIB := both LOCAL_SANITIZE := never LOCAL_RTTI_FLAG := -frtti @@ -101,6 +102,7 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_host +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MULTILIB := both LOCAL_SANITIZE := never |