Create debug builds of more SwiftShader projects

android_vendor_build.sh

@@ -66,6 +66,7 @@ for config in ${CONFIGS}; do
 
   # We don't need the obj files since they can be generated from the syms
 
+  mkdir -p ${OBJECT_DIR}/${TARGET_ARCH}
   rm -rf ${OBJECT_DIR}/${TARGET_ARCH}/*/obj
 
   # JBMR2 (and earlier?) doesn't allow the library name to differ from the

src/Android.mk

 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
 
-LOCAL_MODULE := swiftshader_top
-LOCAL_MODULE_TAGS := optional
+COMMON_C_INCLUDES += \
+	bionic \
+	$(GCE_STLPORT_INCLUDES) \
+        $(LOCAL_PATH)/OpenGL/include \
+        $(LOCAL_PATH)/OpenGL/ \
+        $(LOCAL_PATH) \
+        $(LOCAL_PATH)/Renderer/ \
+        $(LOCAL_PATH)/Common/ \
+        $(LOCAL_PATH)/Shader/ \
+        $(LOCAL_PATH)/LLVM/include \
+        $(LOCAL_PATH)/Main/
 
-LOCAL_SRC_FILES := \
+COMMON_SRC_FILES := \
 	Common/CPUID.cpp \
 	Common/Configurator.cpp \
 	Common/DebugAndroid.cpp \
@@ -19,7 +25,7 @@ LOCAL_SRC_FILES := \
 	Common/Thread.cpp \
 	Common/Timer.cpp
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
 	Main/Config.cpp \
 	Main/FrameBuffer.cpp \
 	Main/FrameBufferAndroid.cpp \
@@ -29,12 +35,12 @@ LOCAL_SRC_FILES += \
 	Main/crc.cpp \
 	Main/serialvalid.cpp \
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
 	Reactor/Nucleus.cpp \
 	Reactor/Routine.cpp \
 	Reactor/RoutineManager.cpp
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
 	Renderer/Blitter.cpp \
 	Renderer/Clipper.cpp \
 	Renderer/Color.cpp \
@@ -53,7 +59,7 @@ LOCAL_SRC_FILES += \
 	Renderer/Vector.cpp \
 	Renderer/VertexProcessor.cpp \
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
 	Shader/Constants.cpp \
 	Shader/PixelPipeline.cpp \
 	Shader/PixelProgram.cpp \
@@ -68,38 +74,29 @@ LOCAL_SRC_FILES += \
 	Shader/VertexRoutine.cpp \
 	Shader/VertexShader.cpp \
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
 	OpenGL/common/AndroidCommon.cpp \
 	OpenGL/common/Image.cpp \
 	OpenGL/common/NameSpace.cpp \
 	OpenGL/common/Object.cpp \
 	OpenGL/common/MatrixStack.cpp \
 
-LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader\" \
-	-Wno-unused-parameter \
-	-DDISPLAY_LOGO=0 \
-	-Wno-implicit-exception-spec-mismatch \
-	-Wno-overloaded-virtual
-
-LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-LOCAL_CFLAGS += -std=c++11
+COMMON_CFLAGS := -DLOG_TAG=\"swiftshader\" -Wno-unused-parameter -DDISPLAY_LOGO=0 -Wno-implicit-exception-spec-mismatch -Wno-overloaded-virtual -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -std=c++11
 
-# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
-# Uncomment for ON:
-# LOCAL_CFLAGS += -UNDEBUG -g -O0
-# Uncomment for OFF:
-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) \
-        $(LOCAL_PATH)/Renderer/ \
-        $(LOCAL_PATH)/Common/ \
-        $(LOCAL_PATH)/Shader/ \
-        $(LOCAL_PATH)/LLVM/include \
-        $(LOCAL_PATH)/Main/
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := swiftshader_top_release
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_CFLAGS := $(COMMON_CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+include $(BUILD_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := swiftshader_top_debug
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 include $(BUILD_STATIC_LIBRARY)

src/OpenGL/compiler/Android.mk

 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
-LOCAL_CLANG := true
+COMMON_C_INCLUDES := \
+	bionic \
+	$(GCE_STLPORT_INCLUDES) \
+	$(LOCAL_PATH)/../include \
+	$(LOCAL_PATH)/../ \
+	$(LOCAL_PATH)/../../ \
+	$(LOCAL_PATH)/../../LLVM/include-android \
+	$(LOCAL_PATH)/../../LLVM/include-linux \
+	$(LOCAL_PATH)/../../LLVM/include \
+	$(LOCAL_PATH)/../../LLVM/lib/Target/X86 \
+	$(LOCAL_PATH)/../../Renderer/ \
+	$(LOCAL_PATH)/../../Common/ \
+	$(LOCAL_PATH)/../../Shader/ \
+	$(LOCAL_PATH)/../../Main/
 
-LOCAL_MODULE := swiftshader_compiler
-LOCAL_MODULE_TAGS := optional
+COMMON_CFLAGS := \
+	-DLOG_TAG=\"swiftshader_compiler\" \
+	-Wno-unused-parameter \
+	-Wno-implicit-exception-spec-mismatch \
+	-Wno-overloaded-virtual \
+	-fno-operator-names \
+	-msse2 \
+	-D__STDC_CONSTANT_MACROS \
+	-D__STDC_LIMIT_MACROS \
+	-std=c++11
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES := \
 	preprocessor/Diagnostics.cpp \
 	preprocessor/DirectiveHandler.cpp \
 	preprocessor/DirectiveParser.cpp \
@@ -43,33 +63,29 @@ LOCAL_SRC_FILES += \
 	ValidateLimitations.cpp \
 	ValidateSwitch.cpp \
 
-LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader_compiler\" \
-	-Wno-unused-parameter \
-	-Wno-implicit-exception-spec-mismatch \
-	-Wno-overloaded-virtual
-
-# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
-# Uncomment for ON:
-# LOCAL_CFLAGS += -UNDEBUG -g -O0
-# Uncomment for OFF:
-LOCAL_CFLAGS += -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
-
-LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-LOCAL_CFLAGS += -std=c++11
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := swiftshader_compiler_release
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_CFLAGS += \
+	$(COMMON_C_FLAGS) \
+	-ffunction-sections \
+	-fdata-sections \
+	-DANGLE_DISABLE_TRACE
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+include $(BUILD_STATIC_LIBRARY)
 
-LOCAL_C_INCLUDES += \
-	bionic \
-	$(GCE_STLPORT_INCLUDES) \
-	$(LOCAL_PATH)/../include \
-	$(LOCAL_PATH)/../ \
-	$(LOCAL_PATH)/../../ \
-	$(LOCAL_PATH)/../../LLVM/include-android \
-	$(LOCAL_PATH)/../../LLVM/include-linux \
-	$(LOCAL_PATH)/../../LLVM/include \
-	$(LOCAL_PATH)/../../LLVM/lib/Target/X86 \
-	$(LOCAL_PATH)/../../Renderer/ \
-	$(LOCAL_PATH)/../../Common/ \
-	$(LOCAL_PATH)/../../Shader/ \
-	$(LOCAL_PATH)/../../Main/
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := swiftshader_compiler_debug
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 
+LOCAL_CFLAGS += \
+	$(COMMON_C_FLAGS) \
+	-UNDEBUG \
+	-g \
+	-O0
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 include $(BUILD_STATIC_LIBRARY)

src/OpenGL/libEGL/Android.mk

@@ -25,7 +25,6 @@ COMMON_C_INCLUDES := \
 	$(LOCAL_PATH)/../../
 
 COMMON_STATIC_LIBRARIES := \
-	swiftshader_top \
 	libLLVM_swiftshader \
 	libgcemetadata
 
@@ -55,7 +54,7 @@ LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
@@ -72,7 +71,7 @@ LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)

src/OpenGL/libGLES_CM/Android.mk

@@ -45,7 +45,7 @@ COMMON_C_INCLUDES := \
         $(LOCAL_PATH)/../../Shader/ \
         $(LOCAL_PATH)/../../Main/
 
-COMMON_STATIC_LIBRARIES := swiftshader_top libLLVM_swiftshader
+COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
 
 COMMON_SHARED_LIBRARIES := \
 	libdl \
@@ -73,7 +73,7 @@ LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
@@ -95,7 +95,7 @@ LOCAL_CFLAGS += \
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)

src/OpenGL/libGLESv2/Android.mk

@@ -50,8 +50,6 @@ COMMON_C_INCLUDES := \
 	$(LOCAL_PATH)/../../Main/
 
 COMMON_STATIC_LIBRARIES := \
-	swiftshader_compiler \
-	swiftshader_top \
 	libLLVM_swiftshader
 
 COMMON_SHARED_LIBRARIES := \
@@ -80,7 +78,7 @@ LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_compiler_debug swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
@@ -102,7 +100,7 @@ LOCAL_CFLAGS += \
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_STATIC_LIBRARIES += $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += swiftshader_compiler_release swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)