| commit | 0ab9f3be379e58fc35c883a11d18b4a14f577fa3 | [log] [tgz] |
|---|---|---|
| author | Alexis Hetu <sugoi@google.com> | Mon Nov 26 17:25:23 2018 -0500 |
| committer | Alexis Hétu <sugoi@google.com> | Thu Dec 06 17:52:07 2018 +0000 |
| tree | 80fc583c17611df4ce175ac59eaae818332a1f76 | |
| parent | 072dc0db329953f8882beb27da73e0f23d90bd11 [diff] [blame] |
Fixed link time warnings on MacOS MacOS' linker dislikes local static variables that are used in two separate libraries. Removing them from the header files fixes all the warnings. Bug b/chromium:907088 Change-Id: I7b8ed44bf9a3180489a7407980740fd3f3863046 Reviewed-on: https://swiftshader-review.googlesource.com/c/22889 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk index 9b00f42..6240d5d 100644 --- a/src/OpenGL/libGLES_CM/Android.mk +++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -44,7 +44,8 @@ ResourceManager.cpp \ Texture.cpp \ utilities.cpp \ - VertexDataManager.cpp + VertexDataManager.cpp \ + ../../Common/SharedLibrary.cpp COMMON_C_INCLUDES := \ bionic \