init: factor out sensors init to a separate file

Change-Id: I14cdbb48cd67de95198b11b5c6032bbbb3a7c7de

4 files changed, 123 insertions, 116 deletions

diff --git a/device-common.mk b/device-common.mk
index 325589c..4dc52e0 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -30,6 +30,7 @@ PRODUCT_AAPT_PREF_CONFIG := mdpi
 # Ramdisk
 PRODUCT_PACKAGES += \
     fstab.espresso \
+    init.espresso.sensors.rc \
     init.espresso.usb.rc \
     init.espresso.rc \
     ueventd.espresso.rc
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 4328c33..1aa0cfc 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -19,6 +19,14 @@ LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE       := init.espresso.sensors.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.tab2.sensors.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
 LOCAL_MODULE       := init.espresso.usb.rc
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
diff --git a/rootdir/etc/init.tab2.rc b/rootdir/etc/init.tab2.rc
index 49c5aa8..ae14256 100644
--- a/rootdir/etc/init.tab2.rc
+++ b/rootdir/etc/init.tab2.rc
@@ -1,4 +1,5 @@
 import init.omap4.rc
+import init.espresso.sensors.rc
 import init.espresso.usb.rc
 
 on init
@@ -34,9 +35,6 @@ on fs
     mount debugfs debugfs /sys/kernel/debug
 
 on post-fs-data
-    # sensors
-    mkdir /data/sensors 0770 system system
-
     # dmrpc
     mkdir /data/smc 0770 drmrpc drmrpc
     chown drmrpc drmrpc /data/smc/counter.bin
@@ -55,109 +53,6 @@ on post-fs-data
     chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state
     chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type
 
-    # Change permissions for sensors
-
-    chown system input /sys/class/input/input2/enable
-    chown system input /sys/class/input/input2/poll_delay
-
-    chown system input /sys/class/input/input3/enable
-    chown system input /sys/class/input/input3/poll_delay
-
-    chown system input /sys/class/input/input2/enable
-    chown system input /sys/class/input/input2/delay
-    chown system input /sys/class/input/input2/wake
-
-    chown system input /sys/class/input/input3/enable
-    chown system input /sys/class/input/input3/delay
-    chown system input /sys/class/input/input3/filter_enable
-    chown system input /sys/class/input/input3/filter_len
-    chown system input /sys/class/input/input3/data
-    chown system input /sys/class/input/input3/status
-    chown system input /sys/class/input/input3/wake
-    chown system input /sys/class/input/input3/position
-
-    chown compass input /sys/class/input/input3/offsets
-    chown compass input /sys/class/input/input3/dynamic_matrix
-    chown system input /sys/class/input/input3/threshold
-    chown system input /sys/class/input/input3/distortion
-    chown system input /sys/class/input/input3/shape
-    write /sys/class/input/input3/distortion "500 350 15"
-
-    chown system input /sys/class/input/input4/enable
-    chown system input /sys/class/input/input4/delay
-    chown system input /sys/class/input/input4/filter_enable
-    chown system input /sys/class/input/input4/filter_len
-    chown system input /sys/class/input/input4/data
-    chown system input /sys/class/input/input4/status
-    chown system input /sys/class/input/input4/wake
-    chown system input /sys/class/input/input4/position
-
-    chown compass input /sys/class/input/input4/offsets
-    chown compass input /sys/class/input/input4/dynamic_matrix
-    chown system input /sys/class/input/input4/threshold
-    chown system input /sys/class/input/input4/distortion
-    chown system input /sys/class/input/input4/shape
-    write /sys/class/input/input4/distortion "500 350 15"
-
-    chown system input /sys/class/input/input5/enable
-    chown system input /sys/class/input/input5/delay
-    chown system input /sys/class/input/input5/filter_enable
-    chown system input /sys/class/input/input5/filter_len
-    chown system input /sys/class/input/input5/data
-    chown system input /sys/class/input/input5/status
-    chown system input /sys/class/input/input5/wake
-    chown system input /sys/class/input/input5/position
-
-    chown compass input /sys/class/input/input5/offsets
-    chown compass input /sys/class/input/input5/dynamic_matrix
-    chown system input /sys/class/input/input5/threshold
-    chown system input /sys/class/input/input5/distortion
-    chown system input /sys/class/input/input5/shape
-    write /sys/class/input/input5/distortion "500 350 15"
-
-    chown system input /sys/class/input/input6/enable
-    chown system input /sys/class/input/input6/delay
-    chown system input /sys/class/input/input6/filter_enable
-    chown system input /sys/class/input/input6/filter_len
-    chown system input /sys/class/input/input6/data
-    chown system input /sys/class/input/input6/status
-    chown system input /sys/class/input/input6/wake
-    chown system input /sys/class/input/input6/position
-
-    chown compass input /sys/class/input/input6/offsets
-    chown compass input /sys/class/input/input6/dynamic_matrix
-    chown system input /sys/class/input/input6/threshold
-    chown system input /sys/class/input/input6/distortion
-    chown system input /sys/class/input/input6/shape
-    write /sys/class/input/input6/distortion "500 350 15"
-
-    chown system input /sys/class/input/input7/enable
-    chown system input /sys/class/input/input7/delay
-    chown system input /sys/class/input/input7/filter_enable
-    chown system input /sys/class/input/input7/filter_len
-    chown system input /sys/class/input/input7/data
-    chown system input /sys/class/input/input7/status
-    chown system input /sys/class/input/input7/wake
-    chown system input /sys/class/input/input7/position
-
-    chown system radio /sys/class/sensors/accelerometer_sensor/raw_data
-    chown system radio /sys/class/sensors/accelerometer_sensor/calibration
-    chown system radio /sys/class/sensors/accelerometer_sensor/vendor
-    chown system radio /sys/class/sensors/accelerometer_sensor/name
-
-    chown system radio /sys/class/sensors/magnetic_sensor/vendor
-    chown system radio /sys/class/sensors/magnetic_sensor/name
-
-    chown system radio /sys/class/sensors/proximity_sensor/state
-    chown system radio /sys/class/sensors/proximity_sensor/raw_data
-    chown system radio /sys/class/sensors/proximity_sensor/vendor
-    chown system radio /sys/class/sensors/proximity_sensor/name
-
-    chown system radio /sys/class/sensors/light_sensor/lux
-    chown system radio /sys/class/sensors/light_sensor/raw_data
-    chown system radio /sys/class/sensors/light_sensor/vendor
-    chown system radio /sys/class/sensors/light_sensor/name
-
     # Change permission for switch
     chmod 0600 /sys/class/sec/switch/jig_on
     chown radio radio /sys/class/sec/switch/jig_on
@@ -202,16 +97,6 @@ service smc_pa /system/bin/smc_pa_ctrl \
     group root
     oneshot
 
-service orientationd /system/bin/orientationd
-    class main
-    user compass
-    group input
-
-service geomagneticd /system/bin/geomagneticd
-    class main
-    user compass
-    group system input
-
 service p2p_supplicant /system/bin/wpa_supplicant \
     -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \
     -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \
diff --git a/rootdir/etc/init.tab2.sensors.rc b/rootdir/etc/init.tab2.sensors.rc
new file mode 100644
index 0000000..895f621
--- /dev/null
+++ b/rootdir/etc/init.tab2.sensors.rc
@@ -0,0 +1,113 @@
+on post-fs-data
+    mkdir /data/sensors 0770 system system
+
+    chown system input /sys/class/input/input2/enable
+    chown system input /sys/class/input/input2/poll_delay
+
+    chown system input /sys/class/input/input3/enable
+    chown system input /sys/class/input/input3/poll_delay
+
+    chown system input /sys/class/input/input2/enable
+    chown system input /sys/class/input/input2/delay
+    chown system input /sys/class/input/input2/wake
+
+    chown system input /sys/class/input/input3/enable
+    chown system input /sys/class/input/input3/delay
+    chown system input /sys/class/input/input3/filter_enable
+    chown system input /sys/class/input/input3/filter_len
+    chown system input /sys/class/input/input3/data
+    chown system input /sys/class/input/input3/status
+    chown system input /sys/class/input/input3/wake
+    chown system input /sys/class/input/input3/position
+
+    chown compass input /sys/class/input/input3/offsets
+    chown compass input /sys/class/input/input3/dynamic_matrix
+    chown system input /sys/class/input/input3/threshold
+    chown system input /sys/class/input/input3/distortion
+    chown system input /sys/class/input/input3/shape
+    write /sys/class/input/input3/distortion "500 350 15"
+
+    chown system input /sys/class/input/input4/enable
+    chown system input /sys/class/input/input4/delay
+    chown system input /sys/class/input/input4/filter_enable
+    chown system input /sys/class/input/input4/filter_len
+    chown system input /sys/class/input/input4/data
+    chown system input /sys/class/input/input4/status
+    chown system input /sys/class/input/input4/wake
+    chown system input /sys/class/input/input4/position
+
+    chown compass input /sys/class/input/input4/offsets
+    chown compass input /sys/class/input/input4/dynamic_matrix
+    chown system input /sys/class/input/input4/threshold
+    chown system input /sys/class/input/input4/distortion
+    chown system input /sys/class/input/input4/shape
+    write /sys/class/input/input4/distortion "500 350 15"
+
+    chown system input /sys/class/input/input5/enable
+    chown system input /sys/class/input/input5/delay
+    chown system input /sys/class/input/input5/filter_enable
+    chown system input /sys/class/input/input5/filter_len
+    chown system input /sys/class/input/input5/data
+    chown system input /sys/class/input/input5/status
+    chown system input /sys/class/input/input5/wake
+    chown system input /sys/class/input/input5/position
+
+    chown compass input /sys/class/input/input5/offsets
+    chown compass input /sys/class/input/input5/dynamic_matrix
+    chown system input /sys/class/input/input5/threshold
+    chown system input /sys/class/input/input5/distortion
+    chown system input /sys/class/input/input5/shape
+    write /sys/class/input/input5/distortion "500 350 15"
+
+    chown system input /sys/class/input/input6/enable
+    chown system input /sys/class/input/input6/delay
+    chown system input /sys/class/input/input6/filter_enable
+    chown system input /sys/class/input/input6/filter_len
+    chown system input /sys/class/input/input6/data
+    chown system input /sys/class/input/input6/status
+    chown system input /sys/class/input/input6/wake
+    chown system input /sys/class/input/input6/position
+
+    chown compass input /sys/class/input/input6/offsets
+    chown compass input /sys/class/input/input6/dynamic_matrix
+    chown system input /sys/class/input/input6/threshold
+    chown system input /sys/class/input/input6/distortion
+    chown system input /sys/class/input/input6/shape
+    write /sys/class/input/input6/distortion "500 350 15"
+
+    chown system input /sys/class/input/input7/enable
+    chown system input /sys/class/input/input7/delay
+    chown system input /sys/class/input/input7/filter_enable
+    chown system input /sys/class/input/input7/filter_len
+    chown system input /sys/class/input/input7/data
+    chown system input /sys/class/input/input7/status
+    chown system input /sys/class/input/input7/wake
+    chown system input /sys/class/input/input7/position
+
+    chown system radio /sys/class/sensors/accelerometer_sensor/raw_data
+    chown system radio /sys/class/sensors/accelerometer_sensor/calibration
+    chown system radio /sys/class/sensors/accelerometer_sensor/vendor
+    chown system radio /sys/class/sensors/accelerometer_sensor/name
+
+    chown system radio /sys/class/sensors/magnetic_sensor/vendor
+    chown system radio /sys/class/sensors/magnetic_sensor/name
+
+    chown system radio /sys/class/sensors/proximity_sensor/state
+    chown system radio /sys/class/sensors/proximity_sensor/raw_data
+    chown system radio /sys/class/sensors/proximity_sensor/vendor
+    chown system radio /sys/class/sensors/proximity_sensor/name
+
+    chown system radio /sys/class/sensors/light_sensor/lux
+    chown system radio /sys/class/sensors/light_sensor/raw_data
+    chown system radio /sys/class/sensors/light_sensor/vendor
+    chown system radio /sys/class/sensors/light_sensor/name
+
+service orientationd /system/bin/orientationd
+    class main
+    user compass
+    group input
+
+service geomagneticd /system/bin/geomagneticd
+    class main
+    user compass
+    group system input