diff options
author | Ying Wang <wangying@google.com> | 2014-07-23 11:33:24 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-07-24 10:36:55 -0700 |
commit | d1ceb8b78f4823c58185a22c5dd047c4174f91b1 (patch) | |
tree | 2a927e06c04918762f74584d1a937eea2b6229aa /opengl | |
parent | 7dc7f3221f26b771c266a26ec785eb74287922f1 (diff) | |
download | frameworks_native-d1ceb8b78f4823c58185a22c5dd047c4174f91b1.zip frameworks_native-d1ceb8b78f4823c58185a22c5dd047c4174f91b1.tar.gz frameworks_native-d1ceb8b78f4823c58185a22c5dd047c4174f91b1.tar.bz2 |
Install symlinks in multilib build.
(cherry picked from commit c3aed1eaefa9c824d5863d58db3954eb642cffe4)
Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libs/Android.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 6b90243..cc5d544 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -112,21 +112,16 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 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 := +# Note we defer the evaluation of the LOCAL_POST_INSTALL_CMD, +# so $(LOCAL_INSTALLED_MODULE) will be expanded to correct value, +# even for both 32-bit and 64-bit installed files in multilib build. +LOCAL_POST_INSTALL_CMD = \ + $(hide) ln -sf $(notdir $(LOCAL_INSTALLED_MODULE)) $(dir $(LOCAL_INSTALLED_MODULE))libGLESv3.so + +include $(BUILD_SHARED_LIBRARY) ############################################################################### # Build the ETC1 host static library |