LineageOS/android_tools_extract-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extract-utils: Specify arch for binary targets

Browse Source 
If arch is not specified, blueprint parsing and elf checks assume the
source is the target arch. If target is 64-bit and the binary is 32-bit,
conflicts in symbols can arise, so lets be specific.

Change-Id: I943e269465e5b20829cb4719b81a7638b025b123
This commit is contained in:
Aaron Kling
2023-09-12 13:02:16 -05:00
committed by Chirayu Desai
parent 8c6023360c
commit 71a53af8cf
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extract_utils.sh
View File

@@ -567,10 +567,24 @@ function write_blueprint_packages() {
printf '\tname: "%s",\n' "$PKGNAME"
printf '\towner: "%s",\n' "$VENDOR"
if [ "$EXTENSION" != "sh" ]; then
printf '\tsrcs: ["%s/bin/%s"],\n' "$SRC" "$FILE"
if [ -z "$DISABLE_CHECKELF" ]; then
printf '\tshared_libs: [%s],\n' "$(basename -s .so $(${OBJDUMP} -x "$ANDROID_ROOT"/"$OUTDIR"/"$SRC"/bin/"$FILE" 2>/dev/null |grep NEEDED) 2>/dev/null |grep -v ^NEEDED$ |sed 's/-3.9.1//g' |sed 's/\(.*\)/"\1",/g' |tr '\n' ' ')"
printf '\ttarget: {\n'
if objdump -a "$ANDROID_ROOT"/"$OUTDIR"/"$SRC"/bin/"$FILE" |grep -c 'file format elf64' > /dev/null; then
printf '\t\tandroid_arm64: {\n'
else
printf '\t\tandroid_arm: {\n'
fi
printf '\t\t\tsrcs: ["%s/bin/%s"],\n' "$SRC" "$FILE"
if [ -z "$DISABLE_CHECKELF" ]; then
printf '\t\t\tshared_libs: [%s],\n' "$(basename -s .so $(${OBJDUMP} -x "$ANDROID_ROOT"/"$OUTDIR"/"$SRC"/bin/"$FILE" 2>/dev/null |grep NEEDED) 2>/dev/null |grep -v ^NEEDED$ |sed 's/-3.9.1//g' |sed 's/\(.*\)/"\1",/g' |tr '\n' ' ')"
fi
printf '\t\t},\n'
printf '\t},\n'
if objdump -a "$ANDROID_ROOT"/"$OUTDIR"/"$SRC"/bin/"$FILE" |grep -c 'file format elf64' > /dev/null; then
printf '\tcompile_multilib: "%s",\n' "64"
else
printf '\tcompile_multilib: "%s",\n' "32"
fi
if [ ! -z "$DISABLE_CHECKELF" ]; then
printf '\tcheck_elf_files: false,\n'
fi
printf '\tstrip: {\n'