diff --git a/testing/dart/APKBUILD b/testing/dart/APKBUILD
index f17fa8ac032..6094eb6f969 100644
--- a/testing/dart/APKBUILD
+++ b/testing/dart/APKBUILD
@@ -2,9 +2,8 @@
 # Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
 pkgname=dart
 pkgver=2.19.4
-pkgrel=1
+pkgrel=2
 _bootstrap=2.18.0
-_llvmver=15
 pkgdesc="Dart is a client-optimized language for fast apps on any platform"
 url="https://dart.dev/"
 arch="x86_64"
@@ -39,6 +38,7 @@ source="
 	musl-reinterpret.patch
 	shim-headers.patch
 	fix-pkg-config.patch
+	toolhack.patch
 	unbundle-icu.patch
 	unbundle-zlib.patch
 
@@ -124,9 +124,9 @@ prepare() {
 	# disarm analytics for sure
 	rg --no-ignore -l '(?:\.|/)google-analytics\.com' . \
 		| while read line; do [[ "$line" == *".js.map" ]] || echo "$line"; done \
-		| xargs sed -i -E 's|([^/]+\.)?google-analytics\.com|0\.0\.0\.0|g'
+		| xargs -n 2 -P ${JOBS:-2} sed -i -E 's|([^/]+\.)?google-analytics\.com|0\.0\.0\.0|g'
 	rg --no-ignore -l 'UA-[0-9]+-[0-9]+' . \
-		| xargs sed -i -E 's|UA-[0-9]+-[0-9]+|UA-2137-0|g'
+		| xargs -n 2 -P ${JOBS:-2} sed -i -E 's|UA-[0-9]+-[0-9]+|UA-2137-0|g'
 
 	sed -i 's/Unknown timestamp/'"$(date -uIm)"'/' tools/make_version.py
 
@@ -165,12 +165,6 @@ build() {
 		verify_sdk_hash=false
 	"
 
-	# this does not make sense but the magic chromium passes makes the default incdir not work..
-	local clangver="$(clang --version | cut -d" " -f4 | head -n1)"
-	
-	export CFLAGS="${CFLAGS/-g/} -I/usr/lib/llvm$_llvmver/lib/clang/$clangver/include -O2"
-	export CXXFLAGS="${CXXFLAGS/-g/} -I/usr/lib/llvm$_llvmver/lib/clang/$clangver/include -O2"
-
 	msg "Generating ninja files"
 	gn gen out --args="$(echo $gn_args)"
 	msg "Building"
@@ -228,6 +222,7 @@ b3aeb574042fe515a3f1cf7fc240f5976d9a86d599b33700caf23fd78f0b937b2ac7e0bdc590281c
 7ca0cd9e370679ee7d34225342db2dbc394f7355f4c06e7e81afb066be9cbb1c2c48fd56d9dfc15bbf8e9ddf6458d2c33ed3db1dace370cdb8dcbfbb240f75b3  musl-reinterpret.patch
 f15e70279d383ebd2b202a123d7dd452ae0212022b372795cdfac530476d017c59352db136e673a06b9cacdbda0c152ce6c19735da637ebd366616f23a752ce4  shim-headers.patch
 a55e52d5b8266d18c743cbd95eb6e2531623ca95a3c91a6a5193ffeabebce5979578b50c00bbbe93c0e5cb88fddd00184fded54ef845fefef4d76d972f4e78a9  fix-pkg-config.patch
+14e4cf9584754995051f5a96a6b89f2557c9ba78d444854004328b45735afc2a3b1628aea57f1ce33f4a976169a7c5c57c0c466094b40fdf80f60b7c87ea6db6  toolhack.patch
 6bd02f8a597c823021f8c5ec4e1f739dd8bceaf9817dd292245c01c5d25b5cc7ac6b9dac3c13e553e1b6fc81cf436b3f161973ff3a76188143b223dfbb48a9f8  unbundle-icu.patch
 cbad6df474d6db74668cd49cf9a55d6899af2e9d40203fa1945339da0e66e90e1265440b83927a97ac9cf07d102347bbdc90b96cd27f5229207b389ccc70ef3e  unbundle-zlib.patch
 68487e1c9bf2caf6791e0ec996e107c23ac2bae7352e9772a7d96f6e467bfbb2c0094e18266081c04e2be67d40d8a9ae8a4bc9a0de93005cd82589839576b5f2  dart2js
diff --git a/testing/dart/toolhack.patch b/testing/dart/toolhack.patch
new file mode 100644
index 00000000000..557b1d5c193
--- /dev/null
+++ b/testing/dart/toolhack.patch
@@ -0,0 +1,13 @@
+this breaks the default clang include dir
+diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn
+index 6b941f0..e465e37 100644
+--- a/build/config/gcc/BUILD.gn
++++ b/build/config/gcc/BUILD.gn
+@@ -75,6 +75,6 @@ config("relative_paths") {
+     # prefix matching absolute_path and hence be mapped to relative_path
+     # in the debugging information, so this should actually be
+     # superfluous for purposes of the debugging information.
+-    "-no-canonical-prefixes",
++    #"-no-canonical-prefixes",
+   ]
+ }