diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 21:00:32 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-01-24 23:06:21 -0800 |
| commit | 5212e4a903d2654572b8bdde0bda3bdd6ecbee6e (patch) | |
| tree | f66002a7f43a71fd263a095670894659d3b2e7f0 /opengl | |
| parent | 44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa (diff) | |
| download | android_device_generic_goldfish-5212e4a903d2654572b8bdde0bda3bdd6ecbee6e.tar.gz android_device_generic_goldfish-5212e4a903d2654572b8bdde0bda3bdd6ecbee6e.tar.bz2 android_device_generic_goldfish-5212e4a903d2654572b8bdde0bda3bdd6ecbee6e.zip | |
device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/common.mk | 6 | ||||
| -rw-r--r-- | opengl/system/GLESv1/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/system/GLESv2/Android.mk | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/opengl/common.mk b/opengl/common.mk index 6dd503e..a4ea7d7 100644 --- a/opengl/common.mk +++ b/opengl/common.mk @@ -234,7 +234,5 @@ endef # $1: library sub-path,relative to /system/lib # For example: $(call emugl-set-shared-library-subpath,egl) emugl-set-shared-library-subpath = \ - $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$1)\ - $(eval LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$1)\ - $(eval _emugl.$(LOCAL_MODULE).moved := true)\ - $(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX)) + $(eval LOCAL_MODULE_RELATIVE_PATH := $1)\ + $(eval _emugl.$(LOCAL_MODULE).moved := true) diff --git a/opengl/system/GLESv1/Android.mk b/opengl/system/GLESv1/Android.mk index 97356b7..8762c11 100644 --- a/opengl/system/GLESv1/Android.mk +++ b/opengl/system/GLESv1/Android.mk @@ -7,6 +7,6 @@ $(call emugl-import,libOpenglSystemCommon libGLESv1_enc lib_renderControl_enc) LOCAL_CFLAGS += -DLOG_TAG=\"GLES_emulation\" -DGL_GLEXT_PROTOTYPES LOCAL_SRC_FILES := gl.cpp -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl +LOCAL_MODULE_RELATIVE_PATH := egl $(call emugl-end-module) diff --git a/opengl/system/GLESv2/Android.mk b/opengl/system/GLESv2/Android.mk index c299522..5a23424 100644 --- a/opengl/system/GLESv2/Android.mk +++ b/opengl/system/GLESv2/Android.mk @@ -7,6 +7,6 @@ $(call emugl-import,libOpenglSystemCommon libGLESv2_enc lib_renderControl_enc) LOCAL_CFLAGS += -DLOG_TAG=\"GLESv2_emulation\" -DGL_GLEXT_PROTOTYPES LOCAL_SRC_FILES := gl2.cpp -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl +LOCAL_MODULE_RELATIVE_PATH := egl $(call emugl-end-module) |