p5100 bring up

This is just a straight port of this:
http://review.cyanogenmod.org/#/c/55931/

I only own the 31xx but almost exactly
the same device.

Change-Id: I340996dc5a96490c96ffa65159932ae59eb89937

5 files changed, 34 insertions, 23 deletions

diff --git a/p51xx-common.mk b/p51xx-common.mk
index 4f5cc2d..3ddab35 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -27,9 +27,8 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk)
 LOCAL_PATH := device/samsung/p5100
 
 # Enable higher-res drawables while keeping mdpi as primary source
-PRODUCT_AAPT_CONFIG := xlarge mdpi hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG := mdpi
-PRODUCT_LOCALES += mdpi
+PRODUCT_AAPT_CONFIG := normal large tvdpi hdpi
+PRODUCT_AAPT_PREF_CONFIG := tvdpi
 
 # Init files
 PRODUCT_COPY_FILES += \
@@ -38,13 +37,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/ueventd.espresso10.rc:root/ueventd.espresso10.rc \
     $(LOCAL_PATH)/rootdir/fstab.espresso10:root/fstab.espresso10
 
-# Audio
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/audio_effects.conf:system/etc/audio_effects.conf
-
 # GPS
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \
     $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml
 
 # Wifi
diff --git a/rootdir/fstab.espresso10 b/rootdir/fstab.espresso10
index b2e4217..54979b6 100644
--- a/rootdir/fstab.espresso10
+++ b/rootdir/fstab.espresso10
@@ -9,8 +9,8 @@
 /dev/block/platform/omap/omap_hsmmc.1/by-name/CACHE             /cache              ext4        noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit      wait,check
 
 # vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1               /storage/sdcard1    auto        defaults        voldmanaged=sdcard1:auto
-/devices/platform/omap/musb-omap2430/musb-hdrc/usb1             /storage/usbdisk0   auto        defaults        voldmanaged=usbdisk0:auto
+/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1               auto    auto    defaults    voldmanaged=sdcard1:auto
+/devices/platform/omap/musb-omap2430/musb-hdrc/usb1             auto    auto    defaults    voldmanaged=usbdisk0:auto
 
 # recovery
 /dev/block/mmcblk0p5                                            /boot               emmc        defaults        recoveryonly
diff --git a/rootdir/init.espresso10.rc b/rootdir/init.espresso10.rc
index 6b3d3d9..eb0733f 100755
--- a/rootdir/init.espresso10.rc
+++ b/rootdir/init.espresso10.rc
@@ -2,10 +2,12 @@ import init.espresso10.usb.rc
 
 on init
     mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage 0550 system sdcard_r
+    mkdir /storage 0751 root sdcard_r
     mkdir /storage/emulated 0555 root root
-    mkdir /storage/sdcard1 0775 system system
-    mkdir /storage/usbdisk0 0775 system system
+    mkdir /storage/sdcard1 0700 root root
+    mkdir /storage/usbdisk0 0700 root root
+    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
+    mkdir /mnt/media_rw/usbdisk0 0700 media_rw media_rw
 
     export EXTERNAL_STORAGE /storage/emulated/legacy
     export SECONDARY_STORAGE /storage/sdcard1
@@ -42,6 +44,7 @@ on fs
     mkdir /efs
     mount_all /fstab.espresso10
 
+# We chown/chmod /efs because mount is run as root + defaults
     chown radio system /efs
     chmod 0775 /efs
 
@@ -313,13 +316,27 @@ service geomagneticd /system/bin/geomagneticd
 # create virtual SD card at /storage/sdcard0, based on the /data/media directory
 # daemon will drop to user/group system/media_rw after initializing
 # underlying files in /data/media will be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
     class late_start
+    oneshot
+
+# FUSE sdcard daemon for rich permissions (runs as media_rw)
+service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
+    class late_start
+    disabled
+
+service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk0 /storage/usbdisk0
+    class late_start
+    disabled
 
 service p2p_supplicant /system/bin/wpa_supplicant \
-        -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
-        -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \
-        -puse_p2p_group_interface=1
+    -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \
+    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+    -O/data/misc/wifi/sockets -N \
+    -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \
+    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
+    -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin \
+    -g@android:wpa_wlan0
     #   we will start as root and wpa_supplicant will switch to user wifi
     #   after setting up the capabilities required for WEXT
     #   user wifi
@@ -330,8 +347,10 @@ service p2p_supplicant /system/bin/wpa_supplicant \
     oneshot
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-        -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \
-        -c/data/misc/wifi/wpa_supplicant.conf
+    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+    -O/data/misc/wifi/sockets \
+    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
     #   we will start as root and wpa_supplicant will switch to user wifi
     #   after setting up the capabilities required for WEXT
     #   user wifi
@@ -410,7 +429,7 @@ on property:ro.bootmode=charger
     write /sys/class/android_usb/android0/functions adb
     write /sys/class/android_usb/android0/enable 1
     write /sys/class/android_usb/android0/iManufacturer samsung
-    write /sys/class/android_usb/android0/iProduct GT-I9100G
+    write /sys/class/android_usb/android0/iProduct $(ro.product.model)
     start adbd
 
 on property:ro.bootmode=charger
diff --git a/selinux/device.te b/selinux/device.te
index 5d39a97..7c28653 100644
--- a/selinux/device.te
+++ b/selinux/device.te
@@ -1,3 +1,2 @@
 type efs_block_device, dev_type;
-type powervr_device, dev_type, mlstrustedobject;
 type rfkill_device, dev_type;
diff --git a/selinux/file_contexts b/selinux/file_contexts
index 2c0d875..c928bb0 100644
--- a/selinux/file_contexts
+++ b/selinux/file_contexts
@@ -1,6 +1,5 @@
 # GFX
 /dev/dsscomp                                u:object_r:video_device:s0
-/dev/pvrsrvkm                               u:object_r:powervr_device:s0
 
 # RIL
 /dev/umts_boot0                             u:object_r:radio_device:s0
@@ -24,7 +23,7 @@
 
 # System binaries
 /system/vendor/bin/pvrsrvinit               u:object_r:pvrsrvinit_exec:s0
-/system/vendor/bin/pvrsrvinit_SGX540_120    u:object_r:pvrsrvinit_exec:s0
+/system/vendor/bin/pvrsrvctl_SGX540_120     u:object_r:pvrsrvinit_exec:s0
 
 # Firmwares
 /system/vendor/firmware/ducati-m3.bin       u:object_r:firmware_ducati:s0