| commit | 40354b8841df8b39a36dd19ef9c853e43a2f5633 | [log] [tgz] |
|---|---|---|
| author | Cody Northrop <cnorthrop@google.com> | Tue Mar 27 12:22:53 2018 -0600 |
| committer | cnorthrop <cnorthrop@google.com> | Tue Mar 27 15:21:53 2018 -0600 |
| tree | 1dfe46333fc6ddce71c5bfd6555288aec9b5cc54 | |
| parent | 53b47de1bc9efce1f2cc1eef4761785d2e3553df [diff] [blame] |
android: Start using gtest from NDK
diff --git a/tests/test_common.h b/tests/test_common.h index 89ffa11..2e48170 100644 --- a/tests/test_common.h +++ b/tests/test_common.h
@@ -53,8 +53,13 @@ #pragma warning(disable : 4251) #pragma warning(disable : 4275) #endif + +// Use the NDK's header on Android +#ifndef __ANDROID__ #include "gtest-1.7.0/include/gtest/gtest.h" +#endif #include "gtest/gtest.h" + #ifdef _WIN32 #pragma warning(pop) #endif