diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-10-16 02:52:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-16 02:52:35 +0000 |
| commit | e9034b4502ae6e693ad52fe2e435066dc969a3ab (patch) | |
| tree | 473ccebebfef2b5768696eab7a5e8e7ce4257da1 | |
| parent | 9cc849500df0bba42d3ed19b90c38ff1dffd2262 (diff) | |
| parent | d3684aeda5b0c8f6101437f9f919d1b9f37f6cef (diff) | |
| download | native-e9034b4502ae6e693ad52fe2e435066dc969a3ab.tar.gz | |
Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
| -rw-r--r-- | opengl/libs/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index cc5d544ae0..2c66f3d5c4 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -77,6 +77,7 @@ LOCAL_SRC_FILES:= \ GLES_CM/gl.cpp.arm \ # +LOCAL_CLANG := false LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL LOCAL_MODULE:= libGLESv1_CM @@ -101,6 +102,7 @@ LOCAL_SRC_FILES:= \ GLES2/gl2.cpp.arm \ # +LOCAL_CLANG := false LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL LOCAL_MODULE:= libGLESv2 |