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

extract_utils: Don't fixup pinned files when they are supposed to be kept

Browse Source 
Change-Id: I6f38bf5928061b0f09eda04f85e00b11912d0227
This commit is contained in:
Arian
2021-09-09 15:24:25 +02:00
parent 302226bb77
commit 8b335032f4
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
extract_utils.sh
View File

@@ -1611,50 +1611,50 @@ function extract() {
colored_echo red " !! ${BLOB_DISPLAY_NAME}: file not found in source" colored_echo red " !! ${BLOB_DISPLAY_NAME}: file not found in source"
continue continue
fi fi
fi
# Blob fixup pipeline has 2 parts: one that is fixed and # Blob fixup pipeline has 2 parts: one that is fixed and
# one that is user-configurable # one that is user-configurable
local PRE_FIXUP_HASH=$(get_hash ${VENDOR_REPO_FILE}) local PRE_FIXUP_HASH=$(get_hash ${VENDOR_REPO_FILE})
# Deodex apk|jar if that's the case # Deodex apk|jar if that's the case
if [[ "$FULLY_DEODEXED" -ne "1" && "${VENDOR_REPO_FILE}" =~ .(apk|jar)$ ]]; then if [[ "$FULLY_DEODEXED" -ne "1" && "${VENDOR_REPO_FILE}" =~ .(apk|jar)$ ]]; then
oat2dex "${VENDOR_REPO_FILE}" "${SRC_FILE}" "$SRC" oat2dex "${VENDOR_REPO_FILE}" "${SRC_FILE}" "$SRC"
if [ -f "$TMPDIR/classes.dex" ]; then if [ -f "$TMPDIR/classes.dex" ]; then
touch -t 200901010000 "$TMPDIR/classes"* touch -t 200901010000 "$TMPDIR/classes"*
zip -gjq "${VENDOR_REPO_FILE}" "$TMPDIR/classes"* zip -gjq "${VENDOR_REPO_FILE}" "$TMPDIR/classes"*
rm "$TMPDIR/classes"* rm "$TMPDIR/classes"*
printf ' (updated %s from odex files)\n' "${SRC_FILE}" printf ' (updated %s from odex files)\n' "${SRC_FILE}"
fi
elif [[ "${VENDOR_REPO_FILE}" =~ .xml$ ]]; then
fix_xml "${VENDOR_REPO_FILE}"
fi fi
elif [[ "${VENDOR_REPO_FILE}" =~ .xml$ ]]; then # Now run user-supplied fixup function
fix_xml "${VENDOR_REPO_FILE}" blob_fixup "${BLOB_DISPLAY_NAME}" "${VENDOR_REPO_FILE}"
fi local POST_FIXUP_HASH=$(get_hash ${VENDOR_REPO_FILE})
# Now run user-supplied fixup function
blob_fixup "${BLOB_DISPLAY_NAME}" "${VENDOR_REPO_FILE}"
local POST_FIXUP_HASH=$(get_hash ${VENDOR_REPO_FILE})
if [ -f "${VENDOR_REPO_FILE}" ]; then if [ -f "${VENDOR_REPO_FILE}" ]; then
local DIR=$(dirname "${VENDOR_REPO_FILE}") local DIR=$(dirname "${VENDOR_REPO_FILE}")
local TYPE="${DIR##*/}" local TYPE="${DIR##*/}"
if [ "$TYPE" = "bin" -o "$TYPE" = "sbin" ]; then if [ "$TYPE" = "bin" -o "$TYPE" = "sbin" ]; then
chmod 755 "${VENDOR_REPO_FILE}" chmod 755 "${VENDOR_REPO_FILE}"
else else
chmod 644 "${VENDOR_REPO_FILE}" chmod 644 "${VENDOR_REPO_FILE}"
fi
fi fi
fi
if [ "${KANG}" = true ]; then if [ "${KANG}" = true ]; then
print_spec "${IS_PRODUCT_PACKAGE}" "${SPEC_SRC_FILE}" "${SPEC_DST_FILE}" "${SPEC_ARGS}" "${PRE_FIXUP_HASH}" "${POST_FIXUP_HASH}" print_spec "${IS_PRODUCT_PACKAGE}" "${SPEC_SRC_FILE}" "${SPEC_DST_FILE}" "${SPEC_ARGS}" "${PRE_FIXUP_HASH}" "${POST_FIXUP_HASH}"
fi fi
# Check and print whether the fixup pipeline actually did anything. # Check and print whether the fixup pipeline actually did anything.
# This isn't done right after the fixup pipeline because we want this print # This isn't done right after the fixup pipeline because we want this print
# to come after print_spec above, when in kang mode. # to come after print_spec above, when in kang mode.
if [ "${PRE_FIXUP_HASH}" != "${POST_FIXUP_HASH}" ]; then if [ "${PRE_FIXUP_HASH}" != "${POST_FIXUP_HASH}" ]; then
printf " + Fixed up %s\n" "${BLOB_DISPLAY_NAME}" printf " + Fixed up %s\n" "${BLOB_DISPLAY_NAME}"
# Now sanity-check the spec for this blob. # Now sanity-check the spec for this blob.
if [ "${KANG}" = false ] && [ "${FIXUP_HASH}" = "x" ] && [ "${HASH}" != "x" ]; then if [ "${KANG}" = false ] && [ "${FIXUP_HASH}" = "x" ] && [ "${HASH}" != "x" ]; then
colored_echo yellow "WARNING: The ${BLOB_DISPLAY_NAME} file was fixed up, but it is pinned." colored_echo yellow "WARNING: The ${BLOB_DISPLAY_NAME} file was fixed up, but it is pinned."
colored_echo yellow "This is a mistake and you want to either remove the hash completely, or add an extra one." colored_echo yellow "This is a mistake and you want to either remove the hash completely, or add an extra one."
fi
fi fi
fi fi