From b4b3b4ab7117a8e21457a456024c37c68bf6c4b0 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 1 Aug 2013 00:32:25 +0000 Subject: [PATCH 1/2] Merge "Fix gles3jni build with clang at android-11" --- ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.c b/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.c index 19b78e7b6..67bf70ccf 100644 --- a/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.c +++ b/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.c @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include "gl3stub.h" GLboolean gl3stubInit() { From 5dce585d708dc330ecc0f2b9b07c8933c964db5a Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 31 Jul 2013 20:14:50 -0700 Subject: [PATCH 2/2] Fix win_sdk build. libutils has been moved to system/core/libs/utils. Change-Id: Ifd75fd7d5bac8aa24be876860eba030c3b5ae3fb --- build/windows_sdk_whitelist.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk index 4ef2aec0b..b9f7196ec 100644 --- a/build/windows_sdk_whitelist.mk +++ b/build/windows_sdk_whitelist.mk @@ -53,6 +53,7 @@ subdirs += \ system/core/liblog \ system/core/libsparse \ system/core/libzipfile \ + system/core/libs/utils \ system/extras/ext4_utils # -----