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/17188Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Make swiftshader build files produce libs in correct folders.
8507f329 · Tomasz Wiszkowski · Nicolas Capens · bc62c3b8 · 8507f329 · 8507f329
Commit 8507f329 authored Feb 12, 2018 by Tomasz Wiszkowski Committed by Nicolas Capens Mar 01, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 36 deletions

Android.mk src/OpenGL/libEGL/Android.mk +4 -12

Android.mk src/OpenGL/libGLES_CM/Android.mk +4 -12

Android.mk src/OpenGL/libGLESv2/Android.mk +4 -12

No files found.
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -68,14 +68,10 @@ LOCAL_MODULE := libEGL_swiftshader_debug
 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 @@ LOCAL_MODULE := libEGL_swiftshader
 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)

--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -90,14 +90,10 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader_debug
 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 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader
 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)

--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -98,14 +98,10 @@ LOCAL_MODULE := libGLESv2_swiftshader_debug
 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 @@ LOCAL_MODULE := libGLESv2_swiftshader
 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)