diff options
| author | Franco Rapetti <frapeti@gmail.com> | 2014-06-07 15:13:42 -0300 |
|---|---|---|
| committer | Franco Rapetti <frapeti@gmail.com> | 2014-06-07 15:13:42 -0300 |
| commit | 2f5f9e1591ffe962d7e9c508b8721ff3e1927453 (patch) | |
| tree | b6beb9a7bf36419e7171f6ce0a7428a3eb622797 | |
| parent | 6e0208ff0bd43d460eed7d08a1aba60014cfda11 (diff) | |
clean camera workaround
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | configs/camera_symlink | 12 | ||||
| -rw-r--r-- | rootdir/init.u8500.rc | 22 |
3 files changed, 12 insertions, 23 deletions
@@ -61,7 +61,6 @@ PRODUCT_COPY_FILES += \ # STE PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/cspsa.conf:system/etc/cspsa.conf \ - $(COMMON_PATH)/configs/camera_symlink:system/bin/camera_symlink \ $(COMMON_PATH)/configs/usbid_init.sh:system/bin/usbid_init.sh # RIL diff --git a/configs/camera_symlink b/configs/camera_symlink deleted file mode 100644 index 73c071b..0000000 --- a/configs/camera_symlink +++ /dev/null @@ -1,12 +0,0 @@ -#!/system/bin/sh - -LIBHEAD="/system/lib/libhead.so" - -if [ ! -f $LIBHEAD ] -then - echo "camerahack: libhead.so not found, symlinking..." - mount -o remount,rw /system - ln -s /system/lib/libjhead.so $LIBHEAD - mount -o remount,ro /system -fi - diff --git a/rootdir/init.u8500.rc b/rootdir/init.u8500.rc index 46528d7..aad0c30 100644 --- a/rootdir/init.u8500.rc +++ b/rootdir/init.u8500.rc @@ -167,7 +167,7 @@ on post-fs-data # EFS wifi permissions chown system system /efs/wifi/.mac.info chmod 0664 /efs/wifi/.mac.info - + # FactoryTest files permission mkdir /efs/FactoryApp 0775 chown radio system /efs/FactoryApp @@ -272,7 +272,7 @@ on boot chown root system /sys/class/sec/gps/GPS_nRST/value chmod 0664 /sys/class/sec/gps/GPS_nRST/value - # Peremissions for bluetooth + # Permissions for bluetooth # UART device chown bluetooth net_bt_stack /dev/ttyAMA0 chmod 0660 /dev/ttyAMA0 @@ -285,12 +285,21 @@ on boot chmod 0664 /sys/class/rfkill/rfkill0/soft setprop service.brcm.bt.pbap_mode btld - # power up/down interface + # Power up/down interface chmod 0660 /sys/class/rfkill/rfkill0/type chmod 0660 /sys/class/rfkill/rfkill0/state chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type + # Camera backward compatibility with outdated blobs + + # Re-mount /system as Read-write + mount ext4 /dev/block/mmcblk0p3 remount rw + # Symlink libjhead.so > libhead.so + symlink /system/lib/libjhead.so /system/lib/libhead.so + # Re-mount /system as Read-only again + mount ext4 /dev/block/mmcblk0p3 remount ro noatime errors=panic + # Bluetooth MAC address programming setprop ro.bt.bdaddr_path "/efs/bluetooth/bt_addr" chown bluetooth bluetooth ro.bt.bdaddr_path @@ -386,13 +395,6 @@ service at_distributor /system/bin/at_distributor user root group radio log -# libhead symlink script -service camera_symlink /system/bin/camera_symlink - class main - user root - oneshot - - service usbid_init /system/bin/usbid_init.sh class main oneshot |