Skip to content

S
swiftshader
Commit 8507f329 by Tomasz Wiszkowski Committed by Nicolas Capens
Options

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: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent bc62c3b8
Showing with 12 additions and 36 deletions
src/OpenGL/libEGL/Android.mk
...@@ -68,14 +68,10 @@ LOCAL_MODULE := libEGL_swiftshader_debug ...@@ -68,14 +68,10 @@ LOCAL_MODULE := libEGL_swiftshader_debug
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES := $(COMMON_SRC_FILES) LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
...@@ -92,14 +88,10 @@ LOCAL_MODULE := libEGL_swiftshader ...@@ -92,14 +88,10 @@ LOCAL_MODULE := libEGL_swiftshader
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES := $(COMMON_SRC_FILES) LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -90,14 +90,10 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader_debug ...@@ -90,14 +90,10 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader_debug
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES) LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
...@@ -114,14 +110,10 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader ...@@ -114,14 +110,10 @@ LOCAL_MODULE := libGLESv1_CM_swiftshader
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES) LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
......
src/OpenGL/libGLESv2/Android.mk
...@@ -98,14 +98,10 @@ LOCAL_MODULE := libGLESv2_swiftshader_debug ...@@ -98,14 +98,10 @@ LOCAL_MODULE := libGLESv2_swiftshader_debug
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES) LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
...@@ -122,14 +118,10 @@ LOCAL_MODULE := libGLESv2_swiftshader ...@@ -122,14 +118,10 @@ LOCAL_MODULE := libGLESv2_swiftshader
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first 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 endif
else
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
endif endif
LOCAL_MODULE_RELATIVE_PATH := egl
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES += $(COMMON_SRC_FILES) LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment