Skip to content

S
swiftshader
Commit 9c025c0a by Nicolas Capens
Options

Use stlport prior to Marshmallow.

Change-Id: I83294568a5725e95fcf2d7490336bead35517bdf Reviewed-on: https://swiftshader-review.googlesource.com/4362Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarGreg Hartman <ghartman@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 137364a7
Showing with 56 additions and 32 deletions
src/Android.mk
...@@ -2,15 +2,19 @@ LOCAL_PATH:= $(call my-dir) ...@@ -2,15 +2,19 @@ LOCAL_PATH:= $(call my-dir)
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \ $(LOCAL_PATH)/OpenGL/include \
$(LOCAL_PATH)/OpenGL/include \ $(LOCAL_PATH)/OpenGL/ \
$(LOCAL_PATH)/OpenGL/ \ $(LOCAL_PATH) \
$(LOCAL_PATH) \ $(LOCAL_PATH)/Renderer/ \
$(LOCAL_PATH)/Renderer/ \ $(LOCAL_PATH)/Common/ \
$(LOCAL_PATH)/Common/ \ $(LOCAL_PATH)/Shader/ \
$(LOCAL_PATH)/Shader/ \ $(LOCAL_PATH)/LLVM/include \
$(LOCAL_PATH)/LLVM/include \ $(LOCAL_PATH)/Main/
$(LOCAL_PATH)/Main/
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_C_INCLUDES += external/stlport/stlport
endif
COMMON_SRC_FILES := \ COMMON_SRC_FILES := \
Common/CPUID.cpp \ Common/CPUID.cpp \
......
src/LLVM/Android.mk
...@@ -417,9 +417,13 @@ LOCAL_CFLAGS += -std=c++11 ...@@ -417,9 +417,13 @@ LOCAL_CFLAGS += -std=c++11
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/include-android \ $(LOCAL_PATH)/include-android \
$(LOCAL_PATH)/include \ $(LOCAL_PATH)/include \
$(LOCAL_PATH)/lib/Target/X86 \ $(LOCAL_PATH)/lib/Target/X86 \
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
LOCAL_C_INCLUDES += external/stlport/stlport
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
src/OpenGL/compiler/Android.mk
...@@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir) ...@@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir)
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -15,6 +14,11 @@ COMMON_C_INCLUDES := \ ...@@ -15,6 +14,11 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_C_INCLUDES += external/stlport/stlport
endif
COMMON_CFLAGS := \ COMMON_CFLAGS := \
-DLOG_TAG=\"swiftshader_compiler\" \ -DLOG_TAG=\"swiftshader_compiler\" \
-Wno-unused-parameter \ -Wno-unused-parameter \
...@@ -93,5 +97,6 @@ LOCAL_CFLAGS += \ ...@@ -93,5 +97,6 @@ LOCAL_CFLAGS += \
-UNDEBUG \ -UNDEBUG \
-g \ -g \
-O0 -O0
LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES) LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
src/OpenGL/libEGL/Android.mk
...@@ -24,7 +24,6 @@ COMMON_SRC_FILES := \ ...@@ -24,7 +24,6 @@ COMMON_SRC_FILES := \
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ $(LOCAL_PATH)/../../
...@@ -37,8 +36,13 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -37,8 +36,13 @@ COMMON_SHARED_LIBRARIES := \
liblog \ liblog \
libutils \ libutils \
libcutils \ libcutils \
libhardware \ libhardware
$(GCE_STLPORT_LIBS)
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_SHARED_LIBRARIES += libstlport
COMMON_C_INCLUDES += external/stlport/stlport
endif
COMMON_LDFLAGS := \ COMMON_LDFLAGS := \
-Wl,--version-script=$(LOCAL_PATH)/exports.map \ -Wl,--version-script=$(LOCAL_PATH)/exports.map \
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -21,7 +21,6 @@ else ...@@ -21,7 +21,6 @@ else
COMMON_CFLAGS += -D__STDC_INT64__ COMMON_CFLAGS += -D__STDC_INT64__
endif endif
COMMON_SRC_FILES := \ COMMON_SRC_FILES := \
Buffer.cpp \ Buffer.cpp \
Context.cpp \ Context.cpp \
...@@ -38,18 +37,17 @@ COMMON_SRC_FILES := \ ...@@ -38,18 +37,17 @@ COMMON_SRC_FILES := \
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../LLVM/include-android \
$(LOCAL_PATH)/../../LLVM/include-android \ $(LOCAL_PATH)/../../LLVM/include-linux \
$(LOCAL_PATH)/../../LLVM/include-linux \ $(LOCAL_PATH)/../../LLVM/include \
$(LOCAL_PATH)/../../LLVM/include \ $(LOCAL_PATH)/../../LLVM/lib/Target/X86 \
$(LOCAL_PATH)/../../LLVM/lib/Target/X86 \ $(LOCAL_PATH)/../../Renderer/ \
$(LOCAL_PATH)/../../Renderer/ \ $(LOCAL_PATH)/../../Common/ \
$(LOCAL_PATH)/../../Common/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Main/
$(LOCAL_PATH)/../../Main/
COMMON_STATIC_LIBRARIES := libLLVM_swiftshader COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
...@@ -59,8 +57,13 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -59,8 +57,13 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware \ libhardware \
libui \ libui \
libutils \ libutils
$(GCE_STLPORT_LIBS)
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_SHARED_LIBRARIES += libstlport
COMMON_C_INCLUDES += external/stlport/stlport
endif
COMMON_LDFLAGS := \ COMMON_LDFLAGS := \
-Wl,--gc-sections \ -Wl,--gc-sections \
......
src/OpenGL/libGLESv2/Android.mk
...@@ -42,7 +42,6 @@ COMMON_SRC_FILES := \ ...@@ -42,7 +42,6 @@ COMMON_SRC_FILES := \
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \ bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -64,8 +63,13 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -64,8 +63,13 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware \ libhardware \
libui \ libui \
libutils \ libutils
$(GCE_STLPORT_LIBS)
# Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_SHARED_LIBRARIES += libstlport
COMMON_C_INCLUDES += external/stlport/stlport
endif
COMMON_LDFLAGS := \ COMMON_LDFLAGS := \
-Wl,--gc-sections \ -Wl,--gc-sections \
......
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