Skip to content

Commit a0b5d84

Browse files
committed
fix --aab flag
1 parent a2d1831 commit a0b5d84

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

crates/tauri-cli/src/mobile/android/build.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ pub struct Options {
6363
pub split_per_abi: bool,
6464
/// Build APKs.
6565
#[clap(long)]
66-
pub apk: Option<bool>,
66+
pub apk: bool,
6767
/// Build AABs.
6868
#[clap(long)]
69-
pub aab: Option<bool>,
69+
pub aab: bool,
70+
#[clap(skip)]
71+
pub skip_bundle: bool,
7072
/// Open Android Studio
7173
#[clap(short, long)]
7274
pub open: bool,
@@ -246,10 +248,10 @@ fn run_build(
246248
env: &mut Env,
247249
noise_level: NoiseLevel,
248250
) -> Result<OptionsHandle> {
249-
if !(options.apk.is_some() || options.aab.is_some()) {
251+
if !options.skip_bundle && !(options.apk || options.aab) {
250252
// if the user didn't specify the format to build, we'll do both
251-
options.apk = Some(true);
252-
options.aab = Some(true);
253+
options.apk = true;
254+
options.aab = true;
253255
}
254256

255257
let interface_options = InterfaceOptions {
@@ -276,7 +278,7 @@ fn run_build(
276278

277279
inject_resources(config, tauri_config.lock().unwrap().as_ref().unwrap())?;
278280

279-
let apk_outputs = if options.apk.unwrap_or_default() {
281+
let apk_outputs = if options.apk {
280282
apk::build(
281283
config,
282284
env,
@@ -290,7 +292,7 @@ fn run_build(
290292
Vec::new()
291293
};
292294

293-
let aab_outputs = if options.aab.unwrap_or_default() {
295+
let aab_outputs = if options.aab {
294296
aab::build(
295297
config,
296298
env,

crates/tauri-cli/src/mobile/android/run.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ pub fn command(options: Options, noise_level: NoiseLevel) -> Result<()> {
9090
features: options.features,
9191
config: options.config.clone(),
9292
split_per_abi: true,
93-
apk: Some(false),
94-
aab: Some(false),
93+
apk: false,
94+
aab: false,
95+
skip_bundle: false,
9596
open: options.open,
9697
ci: false,
9798
args: options.args,

0 commit comments

Comments
 (0)