Turn off tracing on the release build

src/Android.mk

@@ -73,15 +73,15 @@ LOCAL_SRC_FILES += \
 	OpenGL/common/Object.cpp \
 	OpenGL/common/MatrixStack.cpp \
 
-LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader\" -Wno-unused-parameter
+LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader\" -Wno-unused-parameter -DDISPLAY_LOGO=0
 LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS += -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
+# LOCAL_CFLAGS += -UNDEBUG -g -O0
 # Uncomment for OFF:
-#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_PATH)/OpenGL/include \

src/Common/DebugAndroid.cpp

@@ -28,8 +28,10 @@ void AndroidEnterDebugger()
 
 void trace(const char *format, ...)
 {
+#ifndef NDEBUG
     va_list vararg;
     va_start(vararg, format);
     android_vprintLog(ANDROID_LOG_VERBOSE, NULL, LOG_TAG, format, vararg);
     va_end(vararg);
+#endif
 }

src/LLVM/Android.mk

@@ -403,7 +403,7 @@ LOCAL_CFLAGS += -std=c++11
 
 # Android's make system also uses NDEBUG, so we need to set/unset it forcefully
 # Uncomment for debug ON:
-LOCAL_CFLAGS += -UNDEBUG -g -O0
+# LOCAL_CFLAGS += -UNDEBUG -g -O0
 
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/include-android \

src/OpenGL/compiler/Android.mk

@@ -45,9 +45,9 @@ LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader_compiler\" -Wno-unused-parameter
 
 # Android's make system also uses NDEBUG, so we need to set/unset it forcefully
 # Uncomment for ON:
-LOCAL_CFLAGS += -UNDEBUG -g -O0
+# LOCAL_CFLAGS += -UNDEBUG -g -O0
 # Uncomment for OFF:
-#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_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS += -std=c++11