Skip to content

S
swiftshader
Commit f7a3ff04 by Greg Hartman Committed by Nicolas Capens
Options

Fix makefiles for Andoid K

It's not safe to rely on LOCAL_MODULE_RELATIVE_PATH on all branches Cleaned up some unnecessary ifdef's Bug b/75229322 Test: Local build of K Fixes build break ab/4660124 Change-Id: I48d3400a2109cd5a2cf593e03f9e234f490c8252 Reviewed-on: https://swiftshader-review.googlesource.com/18189Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent e3490ede
Showing with 42 additions and 12 deletions
src/OpenGL/libEGL/Android.mk
...@@ -69,12 +69,17 @@ COMMON_LDFLAGS := \ ...@@ -69,12 +69,17 @@ COMMON_LDFLAGS := \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libEGL_swiftshader_debug LOCAL_MODULE := libEGL_swiftshader_debug
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
...@@ -89,12 +94,17 @@ include $(BUILD_SHARED_LIBRARY) ...@@ -89,12 +94,17 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libEGL_swiftshader LOCAL_MODULE := libEGL_swiftshader
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -92,12 +92,17 @@ COMMON_LDFLAGS := \ ...@@ -92,12 +92,17 @@ COMMON_LDFLAGS := \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libGLESv1_CM_swiftshader_debug LOCAL_MODULE := libGLESv1_CM_swiftshader_debug
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
...@@ -112,12 +117,17 @@ include $(BUILD_SHARED_LIBRARY) ...@@ -112,12 +117,17 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libGLESv1_CM_swiftshader LOCAL_MODULE := libGLESv1_CM_swiftshader
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
......
src/OpenGL/libGLESv2/Android.mk
...@@ -101,12 +101,17 @@ COMMON_LDFLAGS := \ ...@@ -101,12 +101,17 @@ COMMON_LDFLAGS := \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libGLESv2_swiftshader_debug LOCAL_MODULE := libGLESv2_swiftshader_debug
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := true
...@@ -121,12 +126,17 @@ include $(BUILD_SHARED_LIBRARY) ...@@ -121,12 +126,17 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libGLESv2_swiftshader LOCAL_MODULE := libGLESv2_swiftshader
ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first LOCAL_MULTILIB := first
endif endif
endif
ifeq (HasRelativePath,$(shell test $(PLATFORM_SDK_VERSION) -ge 21 && echo HasRelativePath))
LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE_RELATIVE_PATH := egl
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
endif
LOCAL_VENDOR_MODULE := true LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true LOCAL_CLANG := 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