Remove symlink /firmware -> /vendor/firmware_mnt

Remove the symbolic link /firmware -> /vendor/firmware_mnt. Also, update
corresponding references in startup scripts to accommodate removal of
this symlink.

Bug: 111434759
Change-Id: I2737a917479ea98d6222b982de52964cd0b098d2
This commit is contained in:
Daniel Mentz
2018-10-24 15:41:31 -07:00
parent 8ebcc0a6ce
commit f7334cbd73
3 changed files with 8 additions and 6 deletions

View File

@@ -121,7 +121,6 @@ BOARD_USES_SYSTEM_OTHER_ODEX := true
BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
include device/google/crosshatch-sepolicy/crosshatch-sepolicy.mk

View File

@@ -18,16 +18,16 @@ else
prev_version_info=""
fi
cur_version_info=`cat /firmware/verinfo/ver_info.txt`
if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
cur_version_info=`cat /vendor/firmware_mnt/verinfo/ver_info.txt`
if [ ! -f /vendor/firmware_mnt/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
rm -rf /data/vendor/radio/modem_config
mkdir /data/vendor/radio/modem_config
chmod 770 /data/vendor/radio/modem_config
cp -r /firmware/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config
cp -r /vendor/firmware_mnt/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config
chown -hR radio.radio /data/vendor/radio/modem_config
cp /firmware/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt
cp /vendor/firmware_mnt/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt
chown radio.radio /data/vendor/radio/ver_info.txt
fi
cp /firmware/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config
cp /vendor/firmware_mnt/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config
chown radio.radio /data/vendor/radio/modem_config/mbn_ota.txt
echo 1 > /data/vendor/radio/copy_complete

View File

@@ -14,6 +14,9 @@
# limitations under the License.
#
# The modem image is mounted at /vendor/firmware_mnt
firmware_directories /vendor/firmware_mnt/image/
# the DIAG device node is not world writable/readable.
/dev/diag 0660 system diag