Fix multilib module path.

Bug 27157109

Change-Id: Ie477455d0b59a8432224f3956e2ba7a1140182af
Reviewed-on: https://swiftshader-review.googlesource.com/4767
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 8de6dc1..0203379 100644 (file)
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -49,8 +49,15 @@ COMMON_LDFLAGS := \
        -Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+endif
 LOCAL_MODULE := libEGL_swiftshader_vendor_debug
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
@@ -64,8 +71,15 @@ LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+endif
 LOCAL_MODULE := libEGL_swiftshader_vendor_release
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index a67ec67..1bb3636 100644 (file)
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -72,8 +72,15 @@ COMMON_LDFLAGS := \
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_debug
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
@@ -88,8 +95,15 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_release
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
 LOCAL_CFLAGS += \

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index bfc1e83..b262892 100644 (file)
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -79,8 +79,15 @@ COMMON_LDFLAGS := \
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv2_swiftshader_vendor_debug
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/debug/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
+endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
@@ -94,8 +101,15 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libGLESv2_swiftshader_vendor_release
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_64 := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+LOCAL_MODULE_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/obj
+LOCAL_UNSTRIPPED_PATH_32 := vendor/transgaming/swiftshader/$(TARGET_2ND_ARCH)/release/sym
+else
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
+endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
 LOCAL_CFLAGS += \