commit 8507f3292ac6e19e4ef237561b205cec69f2fad1
author Tomasz Wiszkowski <ender@google.com> Mon Feb 12 09:05:31 2018 -0800
committer Nicolas Capens <nicolascapens@google.com> Thu Mar 01 18:47:50 2018 +0000
tree 62bd197aba8b1beb35f04e5fcbf68a428ae5d739
parent bc62c3b8185882eff4788c6cfbd29b86a22bfad1

Make swiftshader build files produce libs in correct folders.

Current build system assumes single arch targets to be 32bit and produces 64bit libraries
in an incorrect folder.

The change allows build system to determine proper location of the libraries.

Change-Id: Ic95a36f7108fcae8e6f120f0853ee00e9a8926c1
Reviewed-on: https://swiftshader-review.googlesource.com/17188
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libEGL/Android.mk

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index fa58b0e..e188f3b 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -68,14 +68,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
@@ -92,14 +88,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)

src/OpenGL/libGLES_CM/Android.mk

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 864ae97..315b384 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -90,14 +90,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
@@ -114,14 +110,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)

src/OpenGL/libGLESv2/Android.mk

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index a01e4ea..c0f5913 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -98,14 +98,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
@@ -122,14 +118,10 @@
 ifdef TARGET_2ND_ARCH
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 LOCAL_MULTILIB := first
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
-else
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib/egl
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/egl
 endif
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
 endif
+LOCAL_MODULE_RELATIVE_PATH := egl
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)