diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-10-16 03:13:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 03:13:15 +0000 |
| commit | 1eee62777d619c2bb88bace54a30ac15089111af (patch) | |
| tree | 740d4354a28a42e1e4c227984324545941a7c856 /opengl | |
| parent | 68f35a01d04d0b5c1bcbb2ee27e445a51318351a (diff) | |
| parent | 108e6334c7520cc9fc2f3694e7d4d62db85a97fb (diff) | |
| download | frameworks_native-1eee62777d619c2bb88bace54a30ac15089111af.zip frameworks_native-1eee62777d619c2bb88bace54a30ac15089111af.tar.gz frameworks_native-1eee62777d619c2bb88bace54a30ac15089111af.tar.bz2 | |
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
Diffstat (limited to 'opengl')
| -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 cc5d544..2c66f3d 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 |