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

* commit '108e6334c7520cc9fc2f3694e7d4d62db85a97fb':
  Use LOCAL_CLANG := false for GLES wrappers for now
This commit is contained in:
Chih-hung Hsieh 2014-10-16 03:13:15 +00:00 committed by Android Git Automerger
commit 1eee62777d

View File

@ -77,6 +77,7 @@ LOCAL_SRC_FILES:= \
GLES_CM/gl.cpp.arm \ GLES_CM/gl.cpp.arm \
# #
LOCAL_CLANG := false
LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL
LOCAL_MODULE:= libGLESv1_CM LOCAL_MODULE:= libGLESv1_CM
@ -101,6 +102,7 @@ LOCAL_SRC_FILES:= \
GLES2/gl2.cpp.arm \ GLES2/gl2.cpp.arm \
# #
LOCAL_CLANG := false
LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL
LOCAL_MODULE:= libGLESv2 LOCAL_MODULE:= libGLESv2