Make the Rust client the sole app
This commit is contained in:
1 parent
a8602c1626
commit
d8bb1699a8
230 files changed
+762
-27300
No files matched your search
+2
-30
@@ -17,9 +17,7 @@ label: "AI Sessions",
|
||||
// three constants -- there is nothing here worth spawning a process for.
|
||||
resources: Ron("resources.ron"),
|
||||
|
||||
// The two halves this checkout produces: the server a phone talks to, and
|
||||
// the app that talks to it. They are built in parallel -- this list is the
|
||||
// set, not a sequence, so nothing here should be read as an order.
|
||||
// The server and Rust app build in parallel.
|
||||
components: [
|
||||
Server(
|
||||
name: "server",
|
||||
@@ -39,15 +37,8 @@ components: [
|
||||
),
|
||||
Apk(
|
||||
name: "app",
|
||||
// Release first: the first mode is the default, and the phone runs
|
||||
// the release build -- a debuggable one runs Compose at a fraction
|
||||
// of the speed. Each command below is run with the chosen mode as
|
||||
// its last argument, which is exactly build-apk.sh's interface.
|
||||
modes: ["release", "debug"],
|
||||
// Resolved against this directory, and run in `app/` -- the script
|
||||
// cds to its own directory anyway, so the cwd is here to say where
|
||||
// the app is rather than because the build needs it.
|
||||
build: "app/build-apk.sh",
|
||||
build: "./build-apk.sh",
|
||||
cwd: "app",
|
||||
// The Enroll button in this component's settings: prints the link
|
||||
// that enrols the phone against the server built here, for the
|
||||
@@ -55,23 +46,4 @@ components: [
|
||||
// the terminal the QR would be printed on.
|
||||
enroll: "server/enroll-link.sh",
|
||||
),
|
||||
// E5 (RUST.md): app/shellApp packaged by the xtask instead of Gradle
|
||||
// (cargo ndk -> javac -> d8 -> aapt2 -> zipalign -> apksigner), signed
|
||||
// with the same release key as "app" above so the two can install
|
||||
// over each other -- a separate component, not a mode of "app" above,
|
||||
// because it is a different applicationId (com.example.aiapp.shell)
|
||||
// built by a different tool from different sources. No `cwd`: it
|
||||
// defaults to this checkout's root, which both the `cargo xtask`
|
||||
// alias (`.cargo/config.toml`, resolved relative to the working
|
||||
// directory cargo is run from) and `cargo xtask apk`'s own publishing
|
||||
// step (`scripts/build/outputs/apk/<mode>/*.apk`, matching
|
||||
// discover.rs's `*/build/outputs/apk/*/*.apk` pattern -- see apk.rs's
|
||||
// module doc) both need. The publish directory is `scripts/build`
|
||||
// rather than `scripts/xtask/build` for exactly that reason: the
|
||||
// pattern is one directory deep, and the tool moved two on 2026-09-09.
|
||||
Apk(
|
||||
name: "shell",
|
||||
modes: ["release", "debug"],
|
||||
build: "cargo xtask apk",
|
||||
),
|
||||
],
|
||||
Reference in new issue
Block a user