Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2

Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

Change-Id: I4c164e420979ca0fe0cfb796829feb93bfabe944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-20 07:44:12 +00:00
committed by Automerger Merge Worker

View File

@@ -78,12 +78,16 @@ function prepare_kernel_image()
mkdir -p "${dist_root}" mkdir -p "${dist_root}"
# Prepare prebuilt-info.txt # Prepare prebuilt-info.txt
BID=$(cat "${prebuilts_root}/BUILD_INFO" | sed -n 's/^.*"bid":\s*"\(.*\)".*$/\1/p') # BID=$(cat "${prebuilts_root}/BUILD_INFO" | sed -n 's/^.*"bid":\s*"\(.*\)".*$/\1/p')
cat > "${dist_root}/prebuilt-info.txt" <<EOF # cat > "${dist_root}/prebuilt-info.txt" <<EOF
{ #{
"kernel-build-id": ${BID} # "kernel-build-id": ${BID}
} #}
EOF #EOF
printf "generate ${dist_root}/prebuilt-info.txt with kernel\n"
cksum "${out_root}/kernel-${kernel_version}${postfix}"
strings "${out_root}/kernel-${kernel_version}${postfix}" |grep -E "Linux version [0-9]\." | sed -e 's/Linux version.*-ab//'| cut -f1 -d ' ' > "${dist_root}/prebuilt-info.txt"
} }
# #