diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-14 22:44:23 -0700 |
| commit | d717598616910b5454b56429dec3bfad2757bd52 (patch) | |
| tree | c2271b0f7e475c4ac1cf520bcecd6f35e002d99a /opengl/libs/Android.mk | |
| parent | 5958661507b39cd59e68e9bc2b54399af92847c4 (diff) | |
| parent | 757a434f81895ddcad2481a5912ff1eb0de8a0d6 (diff) | |
| download | frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.zip frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.gz frameworks_native-d717598616910b5454b56429dec3bfad2757bd52.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
Diffstat (limited to 'opengl/libs/Android.mk')
| -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 da00cc5..538e943 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -24,6 +24,7 @@ endif LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) @@ -53,5 +54,6 @@ endif LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES +LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) |