Skip to content

Commit c04aa9f

Browse files
committed
fix: validate native alignment
1 parent 3e75f2a commit c04aa9f

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 0.7.0-rc.47 (Synonym Fork)
1+
# 0.7.0-rc.48 (Synonym Fork)
22

33
## Bug Fixes
44

scripts/uniffi_bindgen_generate_kotlin_android.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,17 @@ has_debug_metadata() {
8787
return 1
8888
}
8989

90+
readelf_program_headers() {
91+
if "$READELF_BIN" -W -l "$1" >/dev/null 2>&1; then
92+
"$READELF_BIN" -W -l "$1"
93+
return
94+
fi
95+
96+
"$READELF_BIN" -l "$1"
97+
}
98+
9099
has_16kb_load_alignment() {
91-
alignments=$("$READELF_BIN" -l "$1" | awk '$1 == "LOAD" { print $NF }')
100+
alignments=$(readelf_program_headers "$1" | awk '$1 == "LOAD" { print $NF }')
92101
if [ -z "$alignments" ]; then
93102
return 1
94103
fi
@@ -115,7 +124,7 @@ validate_android_library() {
115124

116125
if ! has_16kb_load_alignment "$lib"; then
117126
echo "Error: Android native library is not 16 KB page-size aligned: $lib"
118-
"$READELF_BIN" -l "$lib" | grep LOAD || true
127+
readelf_program_headers "$lib" | grep LOAD || true
119128
exit 1
120129
fi
121130
}

0 commit comments

Comments
 (0)