Merge pull request #8737 from unknownbrackets/travis

Split the Android travis build into each ABI

.travis.sh

@@ -1,5 +1,6 @@
 #/bin/bash
 
+export USE_CCACHE=1
 export NDK_CCACHE=ccache
 NDK_VER=android-ndk-r10d
 
@@ -80,15 +81,26 @@ travis_install() {
 		export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE483BIN=$(pwd)/gcc4.8.3_x86-64/bin
 		cp ffmpeg/symbian/armv6/lib/* $EPOCROOT/epoc32/release/armv5/urel/
 	fi
+
+	# Ensure we're using ccache
+	if [[ "$CXX" = "clang" && "$CC" == "clang" ]]; then
+		export CXX="ccache clang" CC="ccache clang"
+	fi
+	if [[ "$PPSSPP_BUILD_TYPE" == "Linux" && "$CXX" == "g++" ]]; then
+		# Also use gcc 4.8, instead of whatever default version.
+		export CXX="ccache g++-4.8" CC="ccache gcc-4.8"
+	fi
+	if [[ "$CXX" != *ccache* ]]; then
+		export CXX="ccache $CXX"
+	fi
+	if [[ "$CC" != *ccache* ]]; then
+		export CC="ccache $CC"
+	fi
 }
 
 travis_script() {
 	# Compile PPSSPP
 	if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
-		if [ "$CXX" = "g++" ]; then
-			export CXX="ccache g++-4.8" CC="ccache gcc-4.8"
-		fi
-
 		if [ "$QT" = "TRUE" ]; then
 			./b.sh --qt
 		else
@@ -102,7 +114,7 @@ travis_script() {
 		fi
 
 		pushd android
-		./ab.sh -j1
+		./ab.sh -j2 APP_ABI=$APP_ABI
 		popd
 	fi
 	if [ "$PPSSPP_BUILD_TYPE" = "Blackberry" ]; then

.travis.yml

@@ -13,6 +13,12 @@ addons:
       - libgl1-mesa-dev
       - libglu1-mesa-dev
       - cmake
+      - aria2
+      - ant
+      - lib32stdc++6
+      - lib32z1
+      - lib32z1-dev
+      - lib32bz2-1.0
 
 cache:
   - apt
@@ -34,8 +40,21 @@ matrix:
       env: PPSSPP_BUILD_TYPE=Linux
            CMAKE=TRUE
     - os: linux
-      compiler: "gcc android"
+      compiler: "gcc android-arm64-v8a"
       env: PPSSPP_BUILD_TYPE=Android
+           APP_ABI=arm64-v8a
+    - os: linux
+      compiler: "gcc android-armeabi-v7a"
+      env: PPSSPP_BUILD_TYPE=Android
+           APP_ABI=armeabi-v7a
+    - os: linux
+      compiler: "gcc android-x86"
+      env: PPSSPP_BUILD_TYPE=Android
+           APP_ABI=x86
+    - os: linux
+      compiler: "gcc android-x86_64"
+      env: PPSSPP_BUILD_TYPE=Android
+           APP_ABI=x86_64
     - os: linux
       compiler: "gcc blackberry"
       env: PPSSPP_BUILD_TYPE=Blackberry

Common/Log.h

@@ -117,8 +117,8 @@ bool GenericLogEnabled(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type);
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
 #define _dbg_assert_(_t_, _a_) \
 	if (!(_a_)) {\
-		ERROR_LOG(_t_, "Error...\n\n  Line: %d\n  File: %s\n  Time: %s\n\nIgnore and continue?", \
-					   __LINE__, __FILE__, __TIME__); \
+		ERROR_LOG(_t_, "Error...\n\n  Line: %d\n  File: %s\n\nIgnore and continue?", \
+					   __LINE__, __FILE__); \
 		if (!PanicYesNo("*** Assertion (see log)***\n")) {Crash();} \
 	}
 #ifdef __SYMBIAN32__