Fix go/ab builds for jb-mr1

[android-x86/external-swiftshader.git] / src / Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index dbf2932..61a4e42 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -1,11 +1,18 @@
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
 
-LOCAL_MODULE := swiftshader_top
+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 \
@@ -18,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 \
@@ -28,16 +35,17 @@ 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 \
        Renderer/Context.cpp \
+       Renderer/ETC_Decoder.cpp \
        Renderer/Matrix.cpp \
        Renderer/PixelProcessor.cpp \
        Renderer/Plane.cpp \
@@ -52,8 +60,10 @@ LOCAL_SRC_FILES += \
        Renderer/Vector.cpp \
        Renderer/VertexProcessor.cpp \
 
-LOCAL_SRC_FILES += \
+COMMON_SRC_FILES += \
        Shader/Constants.cpp \
+       Shader/PixelPipeline.cpp \
+       Shader/PixelProgram.cpp \
        Shader/PixelRoutine.cpp \
        Shader/PixelShader.cpp \
        Shader/SamplerCore.cpp \
@@ -65,33 +75,37 @@ 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\"
-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 -Wno-implicit-exception-spec-mismatch -Wno-overloaded-virtual -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -std=c++11 -Xclang -fuse-init-array
 
-# 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
+ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
+COMMON_CFLAGS += -DDISPLAY_LOGO=0
+endif
 
-LOCAL_C_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 external/stlport/libstlport.mk
+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 -DDEFAULT_THREAD_COUNT=1
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 include $(BUILD_STATIC_LIBRARY)
+
+ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif