ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Install symlinks in multilib build."

Browse Source
This commit is contained in:
Ying Wang 2014-07-23 19:20:09 +00:00 committed by Gerrit Code Review
commit e9105be32f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opengl/libs/Android.mk
View File

@ -112,21 +112,16 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden
include $(BUILD_SHARED_LIBRARY)
# Symlink libGLESv3.so -> libGLESv2.so # Symlink libGLESv3.so -> libGLESv2.so
# Platform modules should link against libGLESv2.so (-lGLESv2), but NDK apps # Platform modules should link against libGLESv2.so (-lGLESv2), but NDK apps
# will be linked against libGLESv3.so. # will be linked against libGLESv3.so.
LIBGLESV2 := $(LOCAL_INSTALLED_MODULE) # Note we defer the evaluation of the LOCAL_POST_INSTALL_CMD,
LIBGLESV3 := $(subst libGLESv2,libGLESv3,$(LIBGLESV2)) # so $(LOCAL_INSTALLED_MODULE) will be expanded to correct value,
$(LIBGLESV3): $(LIBGLESV2) # even for both 32-bit and 64-bit installed files in multilib build.
@echo "Symlink: $@ -> $(notdir $<)" LOCAL_POST_INSTALL_CMD = \
@mkdir -p $(dir $@) $(hide) ln -sf $(notdir $(LOCAL_INSTALLED_MODULE)) $(dir $(LOCAL_INSTALLED_MODULE))libGLESv3.so
$(hide) ln -sf $(notdir $<) $@
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ include $(BUILD_SHARED_LIBRARY)
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(LIBGLESV3)
LIBGLESV2 :=
LIBGLESV3 :=
############################################################################### ###############################################################################
# Build the ETC1 host static library # Build the ETC1 host static library