pixel: firmware: Handle android-info.txt, and only write mk once
* Same as previous commit * Lets us run this script over and over again without issue Change-Id: I8f3237a1111b31b290d86c76a395485edd4e5bea
This commit is contained in:
committed by
Michael Bestas
parent
9ac066087b
commit
674eeaa72b
@@ -50,11 +50,7 @@ readonly vendor_path="${top}/vendor/google/${device}"
|
|||||||
copy_factory_firmware() {
|
copy_factory_firmware() {
|
||||||
cp "${factory_dir}"/bootloader-*.img "${vendor_path}/firmware/bootloader.img"
|
cp "${factory_dir}"/bootloader-*.img "${vendor_path}/firmware/bootloader.img"
|
||||||
cp "${factory_dir}"/radio-*.img "${vendor_path}/firmware/radio.img"
|
cp "${factory_dir}"/radio-*.img "${vendor_path}/firmware/radio.img"
|
||||||
if [[ "${device}" != "oriole" || "${device}" != "raven" ]]; then
|
cp "${factory_dir}"/image/android-info.txt "${vendor_path}/android-info.txt"
|
||||||
echo "TODO android-info.txt"
|
|
||||||
else
|
|
||||||
cp "${factory_dir}"/android-info.txt "${vendor_path}/android-info.txt"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Unpack the seperate partitions needed for OTA
|
# Unpack the seperate partitions needed for OTA
|
||||||
@@ -81,27 +77,32 @@ copy_ota_firmware() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setup_makefiles() {
|
setup_makefiles() {
|
||||||
# I don't like this
|
local exists=$(grep firmware "${vendor_path}/BoardConfigVendor.mk")
|
||||||
sed -i /endif/d "${vendor_path}/Android.mk"
|
if [[ -z "${exists}" ]]; then
|
||||||
|
echo >> "${vendor_path}/BoardConfigVendor.mk"
|
||||||
if [[ "${device}" != "oriole" || "${device}" != "raven" ]]; then
|
echo "# firmware">> "${vendor_path}/BoardConfigVendor.mk"
|
||||||
echo "TODO TARGET_BOARD_INFO_FILE"
|
echo "TARGET_BOARD_INFO_FILE := vendor/google/${device}/android-info.txt" >> "${vendor_path}/BoardConfigVendor.mk"
|
||||||
else
|
echo >> "${vendor_path}/BoardConfigVendor.mk"
|
||||||
echo >> ${vendor_path}/BoardConfigVendor.mk
|
|
||||||
echo "TARGET_BOARD_INFO_FILE := vendor/google/${device}/android-info.txt" >> ${vendor_path}/BoardConfigVendor.mk
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo >> "${vendor_path}/Android.mk"
|
local exists2=$(grep firmware "${vendor_path}/Android.mk")
|
||||||
echo "\$(call add-radio-file,firmware/bootloader.img,version-bootloader)" >> "${vendor_path}/Android.mk"
|
if [[ -z "${exists2}" ]]; then
|
||||||
echo "\$(call add-radio-file,firmware/radio.img,version-baseband)" >> "${vendor_path}/Android.mk"
|
# I don't like this
|
||||||
|
sed -i /endif/d "${vendor_path}/Android.mk"
|
||||||
|
|
||||||
for fp in ${firmware_partitions[@]}; do
|
echo >> "${vendor_path}/Android.mk"
|
||||||
echo "\$(call add-radio-file,firmware/${fp}.img)" >> "${vendor_path}/Android.mk"
|
echo "# firmware" >> "${vendor_path}/Android.mk"
|
||||||
done
|
echo "\$(call add-radio-file,firmware/bootloader.img,version-bootloader)" >> "${vendor_path}/Android.mk"
|
||||||
echo >> "${vendor_path}/Android.mk"
|
echo "\$(call add-radio-file,firmware/radio.img,version-baseband)" >> "${vendor_path}/Android.mk"
|
||||||
|
|
||||||
# I still don't like this
|
for fp in ${firmware_partitions[@]}; do
|
||||||
echo endif >> "${vendor_path}/Android.mk"
|
echo "\$(call add-radio-file,firmware/${fp}.img)" >> "${vendor_path}/Android.mk"
|
||||||
|
done
|
||||||
|
echo >> "${vendor_path}/Android.mk"
|
||||||
|
|
||||||
|
# I still don't like this
|
||||||
|
echo endif >> "${vendor_path}/Android.mk"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# error message
|
# error message
|
||||||
|
|||||||
Reference in New Issue
Block a user