commit 108e6334c7520cc9fc2f3694e7d4d62db85a97fb
author Chih-hung Hsieh <chh@google.com> Thu Oct 16 03:06:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 03:06:42 2014 +0000
tree e2556e50cc6396be8b978b2e3273d2acada73a30
parent 664a72d3ac5e4389041e3a59ff243a5583a4b823
parent e9034b4502ae6e693ad52fe2e435066dc969a3ab

am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"

* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
  Use LOCAL_CLANG := false for GLES wrappers for now

opengl/libs/Android.mk

diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index cc5d544..2c66f3d 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -77,6 +77,7 @@
 	GLES_CM/gl.cpp.arm 	\
 #
 
+LOCAL_CLANG := false
 LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL
 LOCAL_MODULE:= libGLESv1_CM
 
@@ -101,6 +102,7 @@
 	GLES2/gl2.cpp.arm 	\
 #
 
+LOCAL_CLANG := false
 LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL
 LOCAL_MODULE:= libGLESv2