From d16f2f6c3c7c2f899fde35782e1ee978877bb14b Mon Sep 17 00:00:00 2001 From: Jeff McGlynn Date: Tue, 7 Aug 2018 19:03:06 -0700 Subject: Fix build errors when used by the Android Emulator In the Android Emulator, there are two main differences: 1) googletest is the shared version 1.8.0, instead of the later commit used by astc-codec (to get bazel support). 2) Unit tests are all linked together into one binary, so one function needs to be marked "static". --- src/decoder/test/image_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/decoder/test/image_utils.h') diff --git a/src/decoder/test/image_utils.h b/src/decoder/test/image_utils.h index 718696e..adfded5 100644 --- a/src/decoder/test/image_utils.h +++ b/src/decoder/test/image_utils.h @@ -116,7 +116,7 @@ static std::string LoadASTCFile(const std::string& basename) { } } -void LoadGoldenBmp(const std::string& path, ImageBuffer* result) { +static void LoadGoldenBmp(const std::string& path, ImageBuffer* result) { constexpr size_t kBmpHeaderSize = 54; SCOPED_TRACE(testing::Message() << "LoadGoldenBmp " << path); -- cgit v1.2.3