diff options
| author | Davide Garberi <dade.garberi@gmail.com> | 2019-02-01 23:21:22 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2019-02-06 13:56:15 +0100 |
| commit | c87afe42f62abd7667b7a721f19e9acbf1e83fd2 (patch) | |
| tree | 13e8156c48b28e826f5c7a94c310b9dd5205c56e | |
| parent | 4fea6e863c0a050e032496fcdcb43215f71e7fe3 (diff) | |
msm8996-common: Remove rootdir symlinks
* It's better to do it this way so that we can remove all the rootdir symlinks, which could be useful in future for system-as-root
* Hex edit the blobs to search for the new paths (or either update them from Pie) and symlink them to make the length equal to the old path
* Update the two adsp libs from daisy
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: I9c9f89d37f3767f55346dccdfb9362025d478028
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | BoardConfigCommon.mk | 4 | ||||
| -rwxr-xr-x | extract-files.sh | 11 | ||||
| -rw-r--r-- | proprietary-files.txt | 4 |
4 files changed, 19 insertions, 6 deletions
@@ -41,10 +41,16 @@ DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp $(FIRMWARE_MOUNT_POINT): @echo "Creating $(FIRMWARE_MOUNT_POINT)" @mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt +ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false) + @ln -sf /vendor/firmware_mnt $(TARGET_OUT_VENDOR)/f +endif $(BT_FIRMWARE_MOUNT_POINT): @echo "Creating $(BT_FIRMWARE_MOUNT_POINT)" @mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware +ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false) + @ln -sf /vendor/bt_firmware $(TARGET_OUT_VENDOR)/btfw +endif $(DSP_MOUNT_POINT): @echo "Creating $(DSP_MOUNT_POINT)" diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7fd168c..4977751 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -175,10 +175,6 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 58132761600 BOARD_VENDORIMAGE_PARTITION_SIZE := 402653184 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) -BOARD_ROOT_EXTRA_SYMLINKS := \ - /vendor/dsp:/dsp \ - /vendor/firmware_mnt:/firmware \ - /vendor/bt_firmware:/bt_firmware TARGET_COPY_OUT_VENDOR := vendor TARGET_USES_MKE2FS := true diff --git a/extract-files.sh b/extract-files.sh index 50cadd7..c48b61d 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -76,4 +76,15 @@ patchelf --remove-needed libandroid.so "$BLOB_ROOT"/vendor/lib/libmpbase.so sed -i "s|/data/vendor/misc/audio/acdbdata/delta/|/data/vendor/audio/acdbdata/delta/\x00\x00\x00\x00\x00|g" "$BLOB_ROOT"/vendor/lib/libaudcal.so sed -i "s|/data/vendor/misc/audio/acdbdata/delta/|/data/vendor/audio/acdbdata/delta/\x00\x00\x00\x00\x00|g" "$BLOB_ROOT"/vendor/lib64/libaudcal.so +# Hex edit /firmware/image to /vendor/firmware_mnt to delete the outdated rootdir symlinks +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib/hw/keystore.msm8996.so +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib/hw/gatekeeper.msm8996.so +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib64/hw/fingerprint.qcom.so +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib64/hw/keystore.msm8996.so +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib64/hw/gatekeeper.msm8996.so +sed -i "s|/firmware/image|/vendor/f/image|g" "$BLOB_ROOT"/vendor/lib64/libSecureUILib.so + +# Hex edit /bt_firmware to /vendor/btfw to delete the outdated rootdir symlinks +sed -i "s|/bt_firmware|/vendor/btfw|g" "$BLOB_ROOT"/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so + "$MY_DIR"/setup-makefiles.sh diff --git a/proprietary-files.txt b/proprietary-files.txt index b8a2116..8463818 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -4,12 +4,14 @@ vendor/lib64/libadsprpc.so|fe4a7c28a2284ab95c068ad3ffaf256705cf9a02 vendor/lib64/libadsp_default_listener.so|f7ea94537c66dfa11e1235064d43c8f56c3b3c51 vendor/lib64/libfastcvadsp_stub.so|ad72fe745a7a8f4b3a355cc0aaf177c29301f29f vendor/lib64/libfastcvopt.so|8a5bc4a2f5b2b14c421eac5f7e828146ac0f0119 +vendor/lib64/libmdsprpc.so|1b11f9ee7a61d3b8f599f60a9d749d5829a750e6 vendor/lib/libadsprpc.so|a2ff69f96a9242d4be0fe5cae2475c23294f937a vendor/lib/libadsp_default_listener.so|d9de89d55eba2d35a7583584b51335a663705fa7 vendor/lib/libadsp_hvx_callback_skel.so|23e99c81afe6ecaf655aaa93298d65e8d7dfa36a vendor/lib/libadsp_hvx_stub.so|bf3348cb891da176a159102b5ef9522a6a26c170 vendor/lib/libfastcvadsp_stub.so|6b50fd7d53811b51e06fedd87c12a794d0c2f645 vendor/lib/libfastcvopt.so|be6d462207dcc238a734d324c479d1022a324c16 +vendor/lib/libmdsprpc.so|42d996c1d7b37f218ade5cd4b5ef0df37f93475f # ADSP modules vendor/lib/rfsa/adsp/libadsp_fd_skel.so @@ -44,7 +46,6 @@ vendor/lib64/libacdbrtac.so vendor/lib64/libadiertac.so vendor/lib64/libaudcal.so vendor/lib64/libaudioalsa.so -vendor/lib64/libmdsprpc.so vendor/lib64/libqtigef.so vendor/lib/soundfx/libasphere.so vendor/lib/soundfx/libqcbassboost.so @@ -58,7 +59,6 @@ vendor/lib/libadiertac.so vendor/lib/libadm.so vendor/lib/libaudcal.so vendor/lib/libaudioalsa.so -vendor/lib/libmdsprpc.so vendor/lib/libqtigef.so vendor/etc/audio_tuning_mixer.txt |