diff options
| author | 2013-02-24 00:18:55 +0000 | |
|---|---|---|
| committer | 2013-02-24 00:18:56 +0000 | |
| commit | f5c7cb316cc8c8e2d6ae93a659ac771420cbfa2b (patch) | |
| tree | 222470d240944ace5353256533724e1b40855d62 /opengl/libs/Android.mk | |
| parent | 751402c866968204af050f95d14a38cb3c3fa134 (diff) | |
| parent | 5ea4c7305850ad4003d314597f4a8255b5b45ba4 (diff) | |
Merge changes Ic344ef63,If9bb02be,Ic8f94634
* changes:
Symlink /system/lib/libGLESv3.so -> libGLESv2.so
Add ES3 support to libGLESv2 and tracing tools
Import OpenGL ES 3.0 headers from Khronos SVN
Diffstat (limited to 'opengl/libs/Android.mk')
| -rw-r--r-- | opengl/libs/Android.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index ae170966de..581c4d49d9 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -124,6 +124,20 @@ LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) +# Symlink libGLESv3.so -> libGLESv2.so +# Platform modules should link against libGLESv2.so (-lGLESv2), but NDK apps +# will be linked against libGLESv3.so. +LIBGLESV2 := $(LOCAL_INSTALLED_MODULE) +LIBGLESV3 := $(subst libGLESv2,libGLESv3,$(LIBGLESV2)) +$(LIBGLESV3): $(LIBGLESV2) + @echo "Symlink: $@ -> $(notdir $<)" + @mkdir -p $(dir $@) + $(hide) ln -sf $(notdir $<) $@ +ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ + $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(LIBGLESV3) +LIBGLESV2 := +LIBGLESV3 := + ############################################################################### # Build the ETC1 host static library # |