Skip to content

Force the replacement of an existing application #75

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

Force the replacement of an existing application #75

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
4 changes: 2 additions & 2 deletions examples/minimal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ zig build run -Dandroid # Android

```sh
zig build -Dtarget=x86_64-linux-android
adb install ./zig-out/bin/minimal.apk
adb install -r ./zig-out/bin/minimal.apk
adb shell am start -S -W -n com.zig.minimal/android.app.NativeActivity
```

### Build and install for all supported Android targets

```sh
zig build -Dandroid
adb install ./zig-out/bin/minimal.apk
adb install -r ./zig-out/bin/minimal.apk
```

### Uninstall your application
Expand Down
4 changes: 2 additions & 2 deletions examples/raylib/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ zig build run -Dandroid # Android

```sh
zig build -Dtarget=x86_64-linux-android
adb install ./zig-out/bin/raylib.apk
adb install -r ./zig-out/bin/raylib.apk
adb shell am start -S -W -n com.zig.raylib/android.app.NativeActivity
```

### Build and install for all supported Android targets

```sh
zig build -Dandroid
adb install ./zig-out/bin/raylib.apk
adb install -r ./zig-out/bin/raylib.apk
```

### Uninstall your application
Expand Down
4 changes: 2 additions & 2 deletions examples/sdl2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ zig build run -Dandroid # Android

```sh
zig build -Dtarget=x86_64-linux-android
adb install ./zig-out/bin/sdl-zig-demo.apk
adb install -r ./zig-out/bin/sdl-zig-demo.apk
adb shell am start -S -W -n com.zig.sdl2/com.zig.sdl2.ZigSDLActivity
```

### Build and install for all supported Android targets

```sh
zig build -Dandroid=true
adb install ./zig-out/bin/sdl-zig-demo.apk
adb install -r ./zig-out/bin/sdl-zig-demo.apk
```

### Uninstall your application
Expand Down
5 changes: 3 additions & 2 deletions src/androidbuild/tools.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@ pub fn addAdbStart(sdk: *Sdk, package_name_and_java_entry: []const u8) *Step.Run
}

/// Install an APK onto your Android device or emulator
/// ie. "adb install ./zig-out/bin/minimal.apk"
/// ie. "adb install -r ./zig-out/bin/minimal.apk"
pub fn adbInstall(sdk: *Sdk, apk: LazyPath) void {
const b = sdk.b;
const adb_install = sdk.addAdbInstall(apk);
b.getInstallStep().dependOn(&adb_install.step);
}

/// Install an APK onto your Android device or emulator
/// ie. "adb install ./zig-out/bin/minimal.apk"
/// ie. "adb install -r ./zig-out/bin/minimal.apk"
pub fn addAdbInstall(sdk: *Sdk, apk: LazyPath) *Step.Run {
const b = sdk.b;
if (sdk.platform_tools.adb.len == 0) {
Expand All @@ -217,6 +217,7 @@ pub fn addAdbInstall(sdk: *Sdk, apk: LazyPath) *Step.Run {
sdk.platform_tools.adb,
"install",
});
adb_install.addArg("-r");
adb_install.addFileArg(apk);
return adb_install;
}
Expand Down
Loading