diff options
| author | Ying Wang <wangying@google.com> | 2014-07-23 11:33:24 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-23 11:55:43 -0700 |
| commit | c3aed1eaefa9c824d5863d58db3954eb642cffe4 (patch) | |
| tree | d930c8bbff37e24b361ee2de836ac4ce47d37539 /opengl/libs | |
| parent | 76cbbc07ea98d2a2f75173fe7ba5444d44ebd99f (diff) | |
| download | frameworks_native-c3aed1eaefa9c824d5863d58db3954eb642cffe4.zip frameworks_native-c3aed1eaefa9c824d5863d58db3954eb642cffe4.tar.gz frameworks_native-c3aed1eaefa9c824d5863d58db3954eb642cffe4.tar.bz2 | |
Install symlinks in multilib build.
Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
Diffstat (limited to 'opengl/libs')
| -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 |