Skip to content

fix(cli): cap run fails with renamed outputs for android #8334

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
HASH-0021 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): cap run fails with renamed outputs for android #8334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cli/src/android/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export async function runAndroid(
config.android.appDir
}/build/outputs/apk${runFlavor !== '' ? '/' + runFlavor : ''}/debug`;

const apkName = parseApkNameFromFlavor(runFlavor);
const apkName = await parseApkNameFromFlavor(runFlavor, pathToApk);
const apkPath = resolve(pathToApk, apkName);

const nativeRunArgs = ['android', '--app', apkPath, '--target', target.id];
Expand Down
10 changes: 9 additions & 1 deletion cli/src/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,15 @@ export async function checkJDKMajorVersion(): Promise<number> {
}
}

export function parseApkNameFromFlavor(flavor: string): string {
export async function parseApkNameFromFlavor(flavor: string, pathToApk: string): Promise<string> {
if (!flavor) {
const metadataPath = join(pathToApk, 'output-metadata.json');
if (await pathExists(metadataPath)) {
const metadataContent = await readJSON(metadataPath);
if (metadataContent && metadataContent.elements && metadataContent.elements.length && metadataContent.elements[0].outputFile)
return metadataContent.elements[0].outputFile;
}
}
let convertedName = flavor.replace(/([A-Z])/g, '-$1').toLowerCase();

if (convertedName.startsWith('-')) convertedName = convertedName.replace('-', '');
Expand Down
2 changes: 1 addition & 1 deletion cli/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ async function loadAndroidConfig(
if (extConfig.android?.flavor) {
apkPath = `${apkPath}/${extConfig.android?.flavor}`;
}
const apkName = parseApkNameFromFlavor(flavor);
const apkName = await parseApkNameFromFlavor(flavor, `${platformDirAbs}/${apkPath}debug`);
const buildOutputDir = `${apkPath}/debug`;
const cordovaPluginsDir = 'capacitor-cordova-android-plugins';
const studioPath = lazy(() => determineAndroidStudioPath(cliConfig.os));
Expand Down