Skip to content

S
swiftshader
Commit d5411c81 by Greg Hartman
Options

Allow SwiftShader to be moved to a non-default location

BUG: 77218110 Change-Id: Iddaacc2d5fb826ad8b38b46cc9e7ef406b2cd01b Test: oc and pi builds with I0646638710abfc84707ca42faea10f94c87c1f4b Reviewed-on: https://swiftshader-review.googlesource.com/20328Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 4bbff9eb
Showing with 18 additions and 12 deletions
src/OpenGL/libEGL/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
COMMON_SWIFTSHADER_RELATIVE_PATH := $(if $(BOARD_SWIFTSHADER_RELATIVE_PATH),$(BOARD_SWIFTSHADER_RELATIVE_PATH),egl)
COMMON_CFLAGS := \ COMMON_CFLAGS := \
-DLOG_TAG=\"libEGL_swiftshader\" \ -DLOG_TAG=\"libEGL_swiftshader\" \
-std=c++11 \ -std=c++11 \
...@@ -75,9 +77,9 @@ LOCAL_MULTILIB := first ...@@ -75,9 +77,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
...@@ -100,9 +102,9 @@ LOCAL_MULTILIB := first ...@@ -100,9 +102,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
......
src/OpenGL/libGLES_CM/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
COMMON_SWIFTSHADER_RELATIVE_PATH := $(if $(BOARD_SWIFTSHADER_RELATIVE_PATH),$(BOARD_SWIFTSHADER_RELATIVE_PATH),egl)
COMMON_CFLAGS := \ COMMON_CFLAGS := \
-DLOG_TAG=\"libGLES_CM_swiftshader\" \ -DLOG_TAG=\"libGLES_CM_swiftshader\" \
-std=c++11 \ -std=c++11 \
...@@ -98,9 +100,9 @@ LOCAL_MULTILIB := first ...@@ -98,9 +100,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
...@@ -123,9 +125,9 @@ LOCAL_MULTILIB := first ...@@ -123,9 +125,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
......
src/OpenGL/libGLESv2/Android.mk
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
COMMON_SWIFTSHADER_RELATIVE_PATH := $(if $(BOARD_SWIFTSHADER_RELATIVE_PATH),$(BOARD_SWIFTSHADER_RELATIVE_PATH),egl)
COMMON_CFLAGS := \ COMMON_CFLAGS := \
-DLOG_TAG=\"libGLESv2_swiftshader\" \ -DLOG_TAG=\"libGLESv2_swiftshader\" \
-fno-operator-names \ -fno-operator-names \
...@@ -107,9 +109,9 @@ LOCAL_MULTILIB := first ...@@ -107,9 +109,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
...@@ -132,9 +134,9 @@ LOCAL_MULTILIB := first ...@@ -132,9 +134,9 @@ LOCAL_MULTILIB := first
endif endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath)) ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := $(COMMON_SWIFTSHADER_RELATIVE_PATH)
else else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(COMMON_SWIFTSHADER_RELATIVE_PATH)
endif endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
......
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