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

Change-Id: I044e252115993acf91d79daae78cccbd5ea97f74
Reviewed-on: https://swiftshader-review.googlesource.com/3300
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Greg Hartman <ghartman@google.com>

diff --git a/src/Android.mk b/src/Android.mk
index b872ec6..49a1130 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -84,6 +84,8 @@ LOCAL_CFLAGS += -std=c++11
 LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
 
 LOCAL_C_INCLUDES += \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
         $(LOCAL_PATH)/OpenGL/include \
         $(LOCAL_PATH)/OpenGL/ \
         $(LOCAL_PATH) \
@@ -93,7 +95,4 @@ LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/LLVM/include \
         $(LOCAL_PATH)/Main/
 
-
-include external/stlport/libstlport.mk
-
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/LLVM/Android.mk b/src/LLVM/Android.mk
index 28b17c3..4e8bda3 100644 (file)
--- a/src/LLVM/Android.mk
+++ b/src/LLVM/Android.mk
@@ -406,10 +406,10 @@ LOCAL_CFLAGS += -std=c++11
 # LOCAL_CFLAGS += -UNDEBUG -g -O0
 
 LOCAL_C_INCLUDES += \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
        $(LOCAL_PATH)/include-android \
        $(LOCAL_PATH)/include \
        $(LOCAL_PATH)/lib/Target/X86 \
 
-include external/stlport/libstlport.mk
-
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index 8d7df30..3a1f950 100644 (file)
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -53,6 +53,8 @@ LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIM
 LOCAL_CFLAGS += -std=c++11
 
 LOCAL_C_INCLUDES += \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
        $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../ \
        $(LOCAL_PATH)/../../ \
@@ -65,6 +67,4 @@ LOCAL_C_INCLUDES += \
        $(LOCAL_PATH)/../../Shader/ \
        $(LOCAL_PATH)/../../Main/
 
-include external/stlport/libstlport.mk
-
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index e12cb72..d54f71f 100644 (file)
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -15,6 +15,8 @@ COMMON_SRC_FILES := \
        main.cpp
 
 COMMON_C_INCLUDES := \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
        device/google/gce/include \
        $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../ \
@@ -54,7 +56,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -72,5 +73,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index c10ce18..757e29e 100644 (file)
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -29,6 +29,8 @@ COMMON_SRC_FILES := \
        VertexDataManager.cpp
 
 COMMON_C_INCLUDES := \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
         $(LOCAL_PATH)/../include \
         $(LOCAL_PATH)/../ \
         $(LOCAL_PATH)/../../ \
@@ -72,7 +74,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -95,5 +96,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index da665ba..6df8918 100644 (file)
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -33,6 +33,8 @@ COMMON_SRC_FILES := \
        VertexDataManager.cpp \
 
 COMMON_C_INCLUDES := \
+       bionic \
+       $(GCE_STLPORT_INCLUDES) \
        $(LOCAL_PATH)/../include \
        $(LOCAL_PATH)/../ \
        $(LOCAL_PATH)/../../ \
@@ -79,7 +81,6 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -102,5 +103,4 @@ LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)