diff --git a/testing/dart/APKBUILD b/testing/dart/APKBUILD
index e68ad85bf7a..f442549fc9e 100644
--- a/testing/dart/APKBUILD
+++ b/testing/dart/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
 # Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
 pkgname=dart
-pkgver=2.18.0
+pkgver=2.18.2
 _bootstrap=2.18.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Dart is a client-optimized language for fast apps on any platform"
 url="https://dart.dev/"
 arch="x86_64"
@@ -20,7 +20,11 @@ makedepends="
 	samurai
 	sed
 	"
-subpackages="$pkgname-devtools"
+subpackages="
+	$pkgname-dev
+	$pkgname-devtools
+	$pkgname-sdk
+	"
 source="
 	https://s3.sakamoto.pl/lnl-aports-snapshots/dart-sdk-$pkgver.tar.xz
 
@@ -28,7 +32,7 @@ source="
 	musl-sigsetjmp.patch
 	no-analytics.patch
 	no-werror.patch
-	fix-musl-build.patch
+	musl-reinterpret.patch
 
 	dart2js
 	"
@@ -89,6 +93,9 @@ prepare() {
 		*) clang_arch="x64" ;;
 	esac
 
+	mkdir -p .git/logs
+	echo '' > .git/logs/HEAD
+
 	# shut up on clang
 	mkdir -p buildtools/linux-$clang_arch/clang/.versions
 	echo '{"instance_id":"system"}' > buildtools/linux-$clang_arch/clang/.versions/clang.cipd_version
@@ -120,9 +127,10 @@ prepare() {
 build() {
 	local gn_args="
 		dart_debug=false
-		dart_platform_sdk=true
+		dart_platform_sdk=false
 		dart_runtime_mode=\"release\"
 		dart_target_arch=\"$_arch\"
+		dart_use_tcmalloc=false
 		dart_version_git_info=false
 		is_clang=true
 		is_debug=false
@@ -132,25 +140,37 @@ build() {
 		verify_sdk_hash=false
 	"
 	msg "Generating ninja files"
-	gn gen release --args="$(echo $gn_args)"
+	gn gen out --args="$(echo $gn_args)"
 	msg "Building"
-	ninja -C release runtime
+	ninja -C out create_sdk runtime_precompiled gen_kernel
 }
 
 check() {
 	# check sanity
-	./release/dart --version
+	./out/dart --version
 }
 
 package() {
-	install -Dm755 release/dart "$pkgdir"/usr/lib/dart/dart
-	cp -r release/devtools "$pkgdir"/usr/lib/dart/devtools
-	for snap in dartdev dds kernel-service; do
-		install -Dm755 release/$snap.dart.snapshot "$pkgdir"/usr/lib/dart/$snap.dart.snapshot
-	done
+	install -Dm755 out/dart "$pkgdir"/usr/lib/dart/bin/dart
+	install -Dm755 out/dart-sdk/bin/dartaotruntime "$pkgdir"/usr/lib/dart/bin/dartaotruntime
+	cp -r out/devtools "$pkgdir"/usr/lib/dart/devtools
+	cp -r out/dart-sdk/bin/snapshots "$pkgdir"/usr/lib/dart/bin/snapshots
+	install -Dm755 out/gen_snapshot "$pkgdir"/usr/lib/dart/bin/utils/gen_snapshot
 
+	mkdir -p "$pkgdir"/usr/include
+	cp -r out/dart-sdk/include "$pkgdir"/usr/include/dart
+
+	mkdir -p "$pkgdir"/usr/bin
+	ln -s /usr/lib/dart/bin/dart "$pkgdir"/usr/bin/dart
+	ln -s /usr/lib/dart/bin/dartaotruntime "$pkgdir"/usr/bin/dartaotruntime
+}
+
+sdk() {
+	for snap in analysis_server dart2js dartdevc dds frontend_server gen_kernel kernel-service kernel_worker; do
+		amove usr/lib/dart/bin/snapshots/$snap.dart.snapshot
+	done
+	amove usr/lib/dart/bin/utils
 	install -Dm755 "$srcdir"/dart2js "$pkgdir"/usr/bin/dart2js
-	ln -s /usr/lib/dart/dart "$pkgdir"/usr/bin/dart
 }
 
 devtools() {
@@ -158,11 +178,11 @@ devtools() {
 }
 
 sha512sums="
-5375fa42e49692223c43ee7bfc2f0d161adb7eefae38282c42d33cbaabb6eba9a72ef1e33d72c2c5b4f97ea268b03c413856d84fa55d8cd5011571e60e6519d4  dart-sdk-2.18.0.tar.xz
+6c8fe4700a805c1a6cb3db125a50f4d83c35bb08cafe2d5a32d09d5e9ab89183a98b8118864a3284df46befc7b7db1baa7b3ecc079c64bfc7e2310e2f9243e67  dart-sdk-2.18.2.tar.xz
 d8d3c9a1d37a13043952d662a6477eb2427f87f4456b47fe6602426a636c598979e8b12bfe32e8e668c97ef551fa22febfe15e81d232ba31187e7e8ce741d9dc  host-compiler.patch
 28f1c2fc2cfdaac4c0ee55e7cfe13c7802d34b6dd0f1f9c6bf35eff6088eb551d860b1a9cfc14ee8323ae3a8342c471b7cc7a3582a4897c52a6a2a044436750a  musl-sigsetjmp.patch
 960d3c971d7b66e25c5e52c3189edd5356bc66a1aebc51b927b25abad238ec91b367f6c3ddb43ae6ab0d82180cba69ef9529903d5a7dce18dd75ef2bff2ae1d4  no-analytics.patch
 b3aeb574042fe515a3f1cf7fc240f5976d9a86d599b33700caf23fd78f0b937b2ac7e0bdc590281ca18751b02a8e46899e6cdff2d498d23718588eadb1d84366  no-werror.patch
-7ca0cd9e370679ee7d34225342db2dbc394f7355f4c06e7e81afb066be9cbb1c2c48fd56d9dfc15bbf8e9ddf6458d2c33ed3db1dace370cdb8dcbfbb240f75b3  fix-musl-build.patch
-13e506697d95bd3b98b845fc844937064e193d16c2a2e872e805ca4a679f7fe88f5d07050ce9a70425ae47ef04b10100d9e6e0ef253f806c4078b23d9bee8e93  dart2js
+7ca0cd9e370679ee7d34225342db2dbc394f7355f4c06e7e81afb066be9cbb1c2c48fd56d9dfc15bbf8e9ddf6458d2c33ed3db1dace370cdb8dcbfbb240f75b3  musl-reinterpret.patch
+68487e1c9bf2caf6791e0ec996e107c23ac2bae7352e9772a7d96f6e467bfbb2c0094e18266081c04e2be67d40d8a9ae8a4bc9a0de93005cd82589839576b5f2  dart2js
 "
diff --git a/testing/dart/dart2js b/testing/dart/dart2js
index 0b5445afb4d..8ffd65880d3 100755
--- a/testing/dart/dart2js
+++ b/testing/dart/dart2js
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/lib/dart/dart compile js $@
+exec dart run /usr/lib/dart/bin/snapshots/dart2js.dart.snapshot $@
diff --git a/testing/dart/fix-musl-build.patch b/testing/dart/musl-reinterpret.patch
similarity index 100%
rename from testing/dart/fix-musl-build.patch
rename to testing/dart/musl-reinterpret.patch