Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/targets/aar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ import jetifier from '../utils/jetifier';

type TargetOptions = {
androidPath: string,
androidBundleName: string;
reverseJetify: boolean
};

const defaultOptions: TargetOptions = {
androidPath: "android",
androidBundleName: "android.aar",
reverseJetify: false
};

Expand Down Expand Up @@ -49,8 +51,8 @@ export default async function build({
);
await fs.mkdir(output);

const sourceAar = path.join(targetOptions.androidPath, 'build', 'outputs', 'aar', 'android.aar');
const targetAar = path.join(output, 'android.aar');
const sourceAar = path.join(targetOptions.androidPath, 'build', 'outputs', 'aar', targetOptions.androidBundleName);
const targetAar = path.join(output, targetOptions.androidBundleName);

report.info(
`Copying AAR from ${chalk.blue(path.relative(root, sourceAar))} to ${chalk.blue(path.relative(root, targetAar))}`
Expand All @@ -70,7 +72,7 @@ export default async function build({
);
await fs.mkdir(supportOutputPath);

const supportAar = path.join(supportOutputPath, 'android.aar');
const supportAar = path.join(supportOutputPath, targetOptions.androidBundleName);
report.info(
`Using Jetifier to convert AAR from AndroidX to Support AAR at ${chalk.blue(path.relative(root, supportAar))}`
);
Expand Down