cmake: compiler override

Author: illwieckz

Diff for: src/trusted/service_runtime/linux/CMakeLists.txt

@@ -68,10 +68,16 @@ elseif (ARCH_armhf OR ARCH_armel)
 	set(RESERVE_TOP "0x40002000")
 
 	if (DAEMON_CXX_COMPILER_Clang_COMPATIBILITY)
-		if (ARCH_armhf)
-			set(COMPILER_OVERRIDE "arm-linux-gnueabihf-g++")
-		elseif (ARCH_armel)
-			set(COMPILER_OVERRIDE "arm-linux-gnueabi-g++")
+		if (ANDROID)
+			if (ARCH_armel)
+				set(COMPILER_OVERRIDE "arm-linux-androideabi-g++")
+			endif()
+		elseif (LINUX)
+			if (ARCH_armhf)
+				set(COMPILER_OVERRIDE "arm-linux-gnueabihf-g++")
+			elseif (ARCH_armel)
+				set(COMPILER_OVERRIDE "arm-linux-gnueabi-g++")
+			endif()
 		endif()
 	endif()
 elseif (ARCH_mipsel)