diff options
| author | Cody Northrop <cnorthrop@google.com> | 2018-03-27 12:22:53 -0600 |
|---|---|---|
| committer | cnorthrop <cnorthrop@google.com> | 2018-03-27 15:21:53 -0600 |
| commit | 1c28bfeda9dbbea09a2c42f6ea008be7b75889da (patch) | |
| tree | 320f40849c9ff96d3ced9938cd381991245f13a9 /tests | |
| parent | 82be9df06999b9fa8fd2b72d996df3bab4730e5d (diff) | |
| download | Vulkan-Loader-1c28bfeda9dbbea09a2c42f6ea008be7b75889da.tar.gz Vulkan-Loader-1c28bfeda9dbbea09a2c42f6ea008be7b75889da.tar.bz2 Vulkan-Loader-1c28bfeda9dbbea09a2c42f6ea008be7b75889da.zip | |
android: Start using gtest from NDK
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_common.h b/tests/test_common.h index 89ffa11e..2e48170d 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 |