Skip to content

fix(ohos build cargokit): update build directory resolution and error reporting #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qinshah wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(ohos build cargokit): update build directory resolution and error reporting #678

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e2410a
fix(ohos build cargokit): update build directory resolution and error…
qinshah May 1, 2026
b3748aa
Merge branch 'main' into ohos_fix
temeddix Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions flutter_package/cargokit/hvigor/src/plugin/cargokit-hvigor-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,17 @@ function registerCargokitTask(
"libs",
targetName,
);
const buildDir = resolve(dir, "build");

const rootNodeDirPath = node.getParentNode()?.nodeDir.filePath;
// <project>/build/rinf/build/build_tool
// Avoid cannot operate on packages inside the cache.
const buildDir = resolve(
rootNodeDirPath,
"..",
"build",
"rinf",
"build",
"build_tool",
);

if (!rootNodeDirPath) {
throw new Error("rootNodeDirPath is required");
Expand All @@ -86,17 +94,18 @@ function registerCargokitTask(
env: {
...process.env,
CARGOKIT_ROOT_PROJECT_DIR: rootNodeDirPath,
CARGOKIT_TOOL_TEMP_DIR: `${buildDir}/build_tool`,
CARGOKIT_TOOL_TEMP_DIR: buildDir,
CARGOKIT_TARGET_PLATFORMS: PLATFORMS.join(","),
CARGOKIT_MANIFEST_DIR: cargokitManifestPath,
CARGOKIT_CONFIGURATION: "release",
CARGOKIT_TARGET_TEMP_DIR: `${buildDir}/cargokit`,
CARGOKIT_TARGET_TEMP_DIR: `${resolve(dir, "build", "cargokit")}`,
CARGOKIT_OUTPUT_DIR: outputDir,
},
});

if (result.status !== 0) {
throw new Error(`cargokitTask failed with status ${result.status}`);
throw new Error(`cargokitTask failed with status ${result.status}
stderr: ${result.stderr ? `${result.stderr.toString()}` : ""}`);
}
},
dependencies: [`${targetName}@ProcessLibs`],
Expand Down
Loading