fix imports, make emulator run on system architecture

This commit is contained in:
2026-10-07 12:55:26 +02:00
parent 97bda53e9b
commit aa647ee869
5 changed files with 17 additions and 9 deletions
+3
View File
@@ -10,3 +10,6 @@ devenv.local.yaml
.pre-commit-config.yaml
node_modules
scripts/node_modules
# Android emulator state
.android
@@ -1,5 +1,5 @@
<script lang="ts">
import { createRouter, type Todo } from "@glstack-test/rpc"
import { createRouter, type Todo } from "@<@var(context.project.name)>/rpc"
import type { ChangeEventHandler } from "svelte/elements";
const router = createRouter("http://127.0.0.1:8080");
let todos = $state<Todo[]>([])
+5 -4
View File
@@ -30,13 +30,14 @@
version = [ "27.1.12297006" ];
};
};
enterShell = ''
# The emulator's bundled libs are only needed on Linux; macOS uses DYLD paths.
enterShell = lib.optionalString pkgs.stdenv.isLinux ''
export LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$LD_LIBRARY_PATH
'';
# Use a system image matching the host CPU (arm64 on Apple Silicon, x86_64 elsewhere).
scripts.create-avd.exec = ''
if [ ! -f .avd-created ]; then
avdmanager create avd -n "Pixel_5_API34" -k "system-images;android-34;google_apis_playstore;x86_64" -d "pixel_5";
touch .avd-created;
if ! avdmanager list avd -c | grep -qx "Pixel_5_API34"; then
echo no | avdmanager create avd -n "Pixel_5_API34" -k "system-images;android-34;google_apis_playstore;${if pkgs.stdenv.hostPlatform.isAarch64 then "arm64-v8a" else "x86_64"}" -d "pixel_5"
fi
'';
<@endif>
+2 -2
View File
@@ -9,10 +9,10 @@ import (
"connectrpc.com/connect"
"connectrpc.com/validate"
"github.com/<@var(context.project.name)>/<@var(context.project.name)>/db"
"<@var(context.project.goprefix)>/<@var(context.project.name)>/db"
todov1 "<@var(context.project.goprefix)>/<@var(context.project.name)>/gen/todo/v1"
"<@var(context.project.goprefix)>/<@var(context.project.name)>/gen/todo/v1/todov1connect"
. "<@var(context.project.goprefix)>/glstack-test/utils"
. "<@var(context.project.goprefix)>/<@var(context.project.name)>/utils"
"github.com/jackc/pgx/v5/pgtype"
)