Skip to content

Commit e284cd1

Browse files
committed
fix opensles dependency loop
1 parent 7da6461 commit e284cd1

File tree

4 files changed

+2464
-8
lines changed

4 files changed

+2464
-8
lines changed

Sdk.zig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,6 @@ pub fn createApp(
595595
align_step.step.dependOn(&make_unsigned_apk.step);
596596
const apk_file = align_step.addOutputFileArg(apk_filename);
597597

598-
const apk_install = sdk.b.addInstallBinFile(apk_file, apk_filename);
599-
sdk.b.getInstallStep().dependOn(&apk_install.step);
600-
601598
const java_dir = sdk.b.getInstallPath(.lib, "java");
602599
if (java_files_opt) |java_files| {
603600
const d8_cmd_builder = sdk.b.addSystemCommand(&[_][]const u8{sdk.system_tools.d8});
@@ -657,6 +654,11 @@ pub fn createApp(
657654
sign_step.addFileArg(apk_file);
658655
}
659656

657+
const apk_install = sdk.b.addInstallBinFile(apk_file, apk_filename);
658+
sdk.b.getInstallStep().dependOn(&apk_install.step);
659+
// only install after singing the apk
660+
apk_install.step.dependOn(&sign_step.step);
661+
660662
inline for (std.meta.fields(AppTargetConfig)) |fld| {
661663
const target_name = @field(Target, fld.name);
662664
if (@field(targets, fld.name).?) {

build.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn build(b: *std.build.Builder) !void {
1111
const mode = b.standardOptimizeOption(.{});
1212
const android_version = b.option(Sdk.AndroidVersion, "android", "Select the android version, default is 'android5'") orelse .android5;
1313
const aaudio = b.option(bool, "aaudio", "Compile with support for AAudio, default is 'false'") orelse false;
14-
const opensl = b.option(bool, "opensl", "Compile with support for OpenSL ES, default is 'false'") orelse false;
14+
const opensl = b.option(bool, "opensl", "Compile with support for OpenSL ES, default is 'true'") orelse true;
1515

1616
// Provide some KeyStore structure so we can sign our app.
1717
// Recommendation: Don't hardcore your password here, everyone can read it.

0 commit comments

Comments
 (0)