diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-10-16 03:06:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 03:06:25 +0000 |
| commit | 82ba423f1ca6b05956cc82ecb12da8e5048fa645 (patch) | |
| tree | 0f32948e2ebc27285318ecce9062663ef8912eeb /opengl/libs | |
| parent | 759115cd6d6e4f7909342e25f1002a9d74ceee5e (diff) | |
| parent | e9034b4502ae6e693ad52fe2e435066dc969a3ab (diff) | |
| download | frameworks_native-82ba423f1ca6b05956cc82ecb12da8e5048fa645.zip frameworks_native-82ba423f1ca6b05956cc82ecb12da8e5048fa645.tar.gz frameworks_native-82ba423f1ca6b05956cc82ecb12da8e5048fa645.tar.bz2 | |
am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
Use LOCAL_CLANG := false for GLES wrappers for now
Diffstat (limited to 'opengl/libs')
| -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 |