diff --git a/toolchain/Makefile b/toolchain/Makefile
index a0b8c2445..7ee92984d 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -31,7 +31,7 @@ $(TOOLCHAIN_DIR)/$(SDK_DIR): $(SDK_TARBALL)
 	cd latest/bin
 	yes | ./sdkmanager --update
 	yes | ./sdkmanager --licenses
-	./sdkmanager 'platform-tools' 'build-tools;34.0.0' 'platforms;android-30'
+	./sdkmanager 'platform-tools' 'build-tools;36.0.0' 'platforms;android-36'
 	./sdkmanager --uninstall 'emulator' # Installed automatically but we don't need it.
 	rm -f $(TOOLCHAIN_DIR)/$(SDK_TARBALL)