Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

[xdl] Assemble/bundle only the :app project #1937

Merged
merged 1 commit into from
Apr 21, 2020
Merged
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions packages/xdl/src/detach/AndroidShellApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -1233,16 +1233,16 @@ async function buildShellAppAsync(context, sdkVersion, buildType, buildMode) {
let outputPath;
if (buildType === 'app-bundle') {
if (ExponentTools.parseSdkMajorVersion(sdkVersion) >= 36) {
gradleBuildCommand = `bundle${debugOrRelease}`;
gradleBuildCommand = `:app:bundle${debugOrRelease}`;
outputPath = path.join(outputDirPath, debugOrReleaseL, `app-${debugOrReleaseL}.aab`);
} else if (ExponentTools.parseSdkMajorVersion(sdkVersion) >= 33) {
gradleBuildCommand = `bundle${debugOrRelease}`;
gradleBuildCommand = `:app:bundle${debugOrRelease}`;
outputPath = path.join(outputDirPath, debugOrReleaseL, `app.aab`);
} else if (ExponentTools.parseSdkMajorVersion(sdkVersion) >= 32) {
gradleBuildCommand = `bundle${devOrProd}Kernel${debugOrRelease}`;
gradleBuildCommand = `:app:bundle${devOrProd}Kernel${debugOrRelease}`;
outputPath = path.join(outputDirPath, `${devOrProdL}Kernel${debugOrRelease}`, `app.aab`);
} else {
// gradleBuildCommand = `bundle${devOrProd}MinSdk${devOrProd}Kernel${debugOrRelease}`;
// gradleBuildCommand = `:app:bundle${devOrProd}MinSdk${devOrProd}Kernel${debugOrRelease}`;
// outputPath = path.join(
// outputDirPath,
// `${devOrProdL}MinSdk${devOrProd}Kernel`,
Expand All @@ -1256,18 +1256,18 @@ async function buildShellAppAsync(context, sdkVersion, buildType, buildMode) {
}
} else {
if (ExponentTools.parseSdkMajorVersion(sdkVersion) >= 33) {
gradleBuildCommand = `assemble${debugOrRelease}`;
gradleBuildCommand = `:app:assemble${debugOrRelease}`;
outputPath = path.join(outputDirPath, debugOrReleaseL, `app-${debugOrReleaseL}.apk`);
} else if (ExponentTools.parseSdkMajorVersion(sdkVersion) >= 32) {
gradleBuildCommand = `assemble${devOrProd}Kernel${debugOrRelease}`;
gradleBuildCommand = `:app:assemble${devOrProd}Kernel${debugOrRelease}`;
outputPath = path.join(
outputDirPath,
`${devOrProdL}Kernel`,
debugOrReleaseL,
`app-${devOrProdL}Kernel-${debugOrReleaseL}.apk`
);
} else {
gradleBuildCommand = `assemble${devOrProd}MinSdk${devOrProd}Kernel${debugOrRelease}`;
gradleBuildCommand = `:app:assemble${devOrProd}MinSdk${devOrProd}Kernel${debugOrRelease}`;
outputPath = path.join(
outputDirPath,
`${devOrProdL}MinSdk${devOrProd}Kernel`,
Expand Down