diff --git a/project/Build.xml b/project/Build.xml
index d47048e96..23068d800 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -331,6 +331,10 @@
 
 	</files>
 
+	<!-- Run setup now so the submodule projects can determine whether clang or GCC will be used. -->
+	<!-- TODO: if https://github.com/HaxeFoundation/hxcpp/issues/930 ever gets resolved, use that instead. -->
+	<setup name="androidNdk" if="android" />
+
 	<include name="lib/cairo-files.xml" />
 	<include name="lib/curl-files.xml" />
 	<include name="lib/efsw-files.xml" />
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
index bad3e4339..c1d877ac1 100644
--- a/project/lib/pixman-files.xml
+++ b/project/lib/pixman-files.xml
@@ -7,6 +7,8 @@
 
 	<files id="native-toolkit-pixman" >
 
+		<compilerflag value="-fno-integrated-as" if="NDKV20+" />
+
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman/pixman" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/pixman/pixman" />