Skip to content

S
swiftshader
Commit 127fac35 by Greg Hartman
Options

Remove direct references to stlport. These break the M branch.

Change-Id: I044e252115993acf91d79daae78cccbd5ea97f74 Reviewed-on: https://swiftshader-review.googlesource.com/3300Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent da6b27ae
Showing with 12 additions and 13 deletions
src/Android.mk
...@@ -84,6 +84,8 @@ LOCAL_CFLAGS += -std=c++11 ...@@ -84,6 +84,8 @@ LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/OpenGL/include \ $(LOCAL_PATH)/OpenGL/include \
$(LOCAL_PATH)/OpenGL/ \ $(LOCAL_PATH)/OpenGL/ \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
...@@ -93,7 +95,4 @@ LOCAL_C_INCLUDES += \ ...@@ -93,7 +95,4 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/LLVM/include \ $(LOCAL_PATH)/LLVM/include \
$(LOCAL_PATH)/Main/ $(LOCAL_PATH)/Main/
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
src/LLVM/Android.mk
...@@ -406,10 +406,10 @@ LOCAL_CFLAGS += -std=c++11 ...@@ -406,10 +406,10 @@ LOCAL_CFLAGS += -std=c++11
# LOCAL_CFLAGS += -UNDEBUG -g -O0 # LOCAL_CFLAGS += -UNDEBUG -g -O0
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
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 \
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
src/OpenGL/compiler/Android.mk
...@@ -53,6 +53,8 @@ LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIM ...@@ -53,6 +53,8 @@ LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIM
LOCAL_CFLAGS += -std=c++11 LOCAL_CFLAGS += -std=c++11
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -65,6 +67,4 @@ LOCAL_C_INCLUDES += \ ...@@ -65,6 +67,4 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../Shader/ \ $(LOCAL_PATH)/../../Shader/ \
$(LOCAL_PATH)/../../Main/ $(LOCAL_PATH)/../../Main/
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
src/OpenGL/libEGL/Android.mk
...@@ -15,6 +15,8 @@ COMMON_SRC_FILES := \ ...@@ -15,6 +15,8 @@ COMMON_SRC_FILES := \
main.cpp main.cpp
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \
$(GCE_STLPORT_INCLUDES) \
device/google/gce/include \ device/google/gce/include \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
...@@ -54,7 +56,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -54,7 +56,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -72,5 +73,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -72,5 +73,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/OpenGL/libGLES_CM/Android.mk
...@@ -29,6 +29,8 @@ COMMON_SRC_FILES := \ ...@@ -29,6 +29,8 @@ COMMON_SRC_FILES := \
VertexDataManager.cpp VertexDataManager.cpp
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -72,7 +74,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -72,7 +74,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -95,5 +96,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -95,5 +96,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/OpenGL/libGLESv2/Android.mk
...@@ -33,6 +33,8 @@ COMMON_SRC_FILES := \ ...@@ -33,6 +33,8 @@ COMMON_SRC_FILES := \
VertexDataManager.cpp \ VertexDataManager.cpp \
COMMON_C_INCLUDES := \ COMMON_C_INCLUDES := \
bionic \
$(GCE_STLPORT_INCLUDES) \
$(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../ \ $(LOCAL_PATH)/../ \
$(LOCAL_PATH)/../../ \ $(LOCAL_PATH)/../../ \
...@@ -79,7 +81,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -79,7 +81,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -102,5 +103,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES) ...@@ -102,5 +103,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
LOCAL_LDFLAGS += $(COMMON_LDFLAGS) LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
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