diff options
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | config.fs | 6 | ||||
| -rw-r--r-- | proprietary-files.txt | 6 | ||||
| -rw-r--r-- | rootdir/etc/fstab.qcom | 1 | ||||
| -rw-r--r-- | sepolicy/hal_bluetooth_default.te | 2 | ||||
| -rw-r--r-- | sepolicy/priv_app.te | 1 |
6 files changed, 10 insertions, 13 deletions
@@ -136,13 +136,12 @@ $(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) $(WCNSS_MAC_SYMLINK) -BT_FIRMWARE := btfw32.tlv btnv32.bin btnv32.b15 -BT_FIRMWARE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(BT_FIRMWARE))) +BT_FIRMWARE_SYMLINKS := $(TARGET_ROOT_OUT)/bt_firmware/image $(BT_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Creating BT firmware symlink: $@" - @mkdir -p $(dir $@) + @mkdir -p $@ @rm -rf $@ - $(hide) ln -sf /bt_firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware $@ ALL_DEFAULT_INSTALLED_MODULES += $(BT_FIRMWARE_SYMLINKS) @@ -73,12 +73,6 @@ user: AID_SYSTEM group: AID_SYSTEM caps: 0 -[bt_firmware/] -mode: 0771 -user: AID_SYSTEM -group: AID_SYSTEM -caps: 0 - [persist/] mode: 0771 user: AID_SYSTEM diff --git a/proprietary-files.txt b/proprietary-files.txt index bdca9c9..d9a4400 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -67,12 +67,16 @@ vendor/bin/wcnss_filter|68cc5d856e778446ae8753bcbf6e346f917754d7 vendor/lib/libbtnv.so|33673920d11a1221d24f7ca89f3559946959ccfb vendor/lib64/libbtnv.so|198cc0d7129441bf8468ed92066fff179f79856c -# Bluetooth (aptX) - from marlin - OPM2.171019.029 +# Bluetooth (aptX) - from marlin - PPR1.180610.009 vendor/lib64/libaptX_encoder.so|0cebad28afcf29f931bdc2d24fce2730dc882ecf vendor/lib64/libaptXHD_encoder.so|90f47f10af28b3ead143200cb4370b847c513127 vendor/lib/libaptX_encoder.so|984739a0bc968e18f75ced205733fe3f51c2d4f0 vendor/lib/libaptXHD_encoder.so|974c486e4ca03faa0713553d9dfe2995ac93e01c +# Bluetooth (firmware) - from marlin - PPR1.180610.009 +vendor/firmware/btfw32.tlv|46767a06a44a313c6775acfb6e59f73414ca66d1 +vendor/firmware/btnv32.bin|d527fc24cab04168fb9c4d009eb1c0132718abee + # Camera vendor/bin/mm-qcamera-daemon vendor/lib/libchromaflash.so diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 7df4742..fb46b13 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -18,7 +18,6 @@ /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait /dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1,context=u:object_r:adsprpcd_file:s0 wait /dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=222,fmask=333,context=u:object_r:bt_firmware_file:s0 wait /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 /dev/block/bootdevice/by-name/frp /frp emmc defaults defaults diff --git a/sepolicy/hal_bluetooth_default.te b/sepolicy/hal_bluetooth_default.te index cd5c85d..c4b97e4 100644 --- a/sepolicy/hal_bluetooth_default.te +++ b/sepolicy/hal_bluetooth_default.te @@ -1,4 +1,6 @@ allow hal_bluetooth_default bluetooth_data_file:dir ra_dir_perms; allow hal_bluetooth_default bluetooth_data_file:file create_file_perms; +allow hal_bluetooth_default firmware_file:file r_file_perms; + allow hal_bluetooth_default wcnss_filter:unix_stream_socket connectto; diff --git a/sepolicy/priv_app.te b/sepolicy/priv_app.te index cb80c06..9c25bf9 100644 --- a/sepolicy/priv_app.te +++ b/sepolicy/priv_app.te @@ -1,6 +1,5 @@ allow priv_app adsprpcd_file:filesystem getattr; allow priv_app asec_apk_file:dir r_dir_perms; -allow priv_app bt_firmware_file:dir r_dir_perms; allow priv_app cache_private_backup_file:dir r_dir_perms; allow priv_app cgroup:dir r_dir_perms; allow priv_app configfs:dir r_dir_perms; |