jellybean cleanup

Change-Id: Ied0ef6d0c8c57cabeb359e5326444f52af3a2028

6 files changed, 75 insertions, 46 deletions

diff --git a/fstab.smdk4x12 b/fstab.smdk4x12
new file mode 100644
index 0000000..713d550
--- /dev/null
+++ b/fstab.smdk4x12
@@ -0,0 +1,13 @@
+# Android fstab file.
+#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+
+/dev/block/mmcblk0p3    /efs               ext4      noatime,nosuid,nodev,journal_async_commit,errors=panic    wait
+/dev/block/mmcblk0p9    /system             ext4      ro,noatime                                           wait
+/dev/block/mmcblk0p8    /cache              ext4      noatime,nosuid,nodev,journal_async_commit,errors=panic    wait
+
+# data partition must be located at the bottom for supporting device encryption
+/dev/block/mmcblk0p12    /data               ext4      noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic    wait,check,encryptable=footer
+
diff --git a/i9300.mk b/i9300.mk
index 35e85e4..edf48e6 100644
--- a/i9300.mk
+++ b/i9300.mk
@@ -14,7 +14,9 @@
 # limitations under the License.
 #
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/i9300/overlay
+LOCAL_PATH := device/samsung/i9300
+
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
@@ -32,25 +34,27 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
 # Init files
 PRODUCT_COPY_FILES := \
-    device/samsung/i9300/init.bt.rc:root/init.bt.rc \
-    device/samsung/i9300/init.smdk4x12.rc:root/init.smdk4x12.rc \
-    device/samsung/i9300/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
-    device/samsung/i9300/lpm.rc:root/lpm.rc \
-    device/samsung/i9300/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
-    device/samsung/i9300/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
+    $(LOCAL_PATH)/fstab.smdk4x12:root/fstab.smdk4x12 \
+    $(LOCAL_PATH)/init.bt.rc:root/init.bt.rc \
+    $(LOCAL_PATH)/init.smdk4x12.rc:root/init.smdk4x12.rc \
+    $(LOCAL_PATH)/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
+    $(LOCAL_PATH)/lpm.rc:root/lpm.rc \
+    $(LOCAL_PATH)/init.trace.rc:root/init.trace.rc \
+    $(LOCAL_PATH)/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
+    $(LOCAL_PATH)/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
 
 # Camera FW
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/80cfw:system/etc/init.d/80cfw
+    $(LOCAL_PATH)/80cfw:system/etc/init.d/80cfw
 
 # Audio
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/configs/tiny_hw.xml:system/etc/sound/m0 \
-    device/samsung/i9300/configs/audio_policy.conf:system/etc/audio_policy.conf
+    $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0 \
+    $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
 
 # Vold and Storage
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/configs/vold.fstab:system/etc/vold.fstab
+    $(LOCAL_PATH)/configs/vold.fstab:system/etc/vold.fstab
 
 # Bluetooth configuration files
 PRODUCT_COPY_FILES += \
@@ -58,7 +62,7 @@ PRODUCT_COPY_FILES += \
 
 # Wifi
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
+    $(LOCAL_PATH)/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
 
 PRODUCT_PROPERTY_OVERRIDES += \
     wifi.interface=wlan0 \
@@ -66,8 +70,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Gps
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/configs/gps.conf:system/etc/gps.conf \
-    device/samsung/i9300/configs/gps.xml:system/etc/gps.xml
+    $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \
+    $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml
 
 # Packages
 PRODUCT_PACKAGES := \
@@ -90,20 +94,6 @@ PRODUCT_PACKAGES += \
     nfc.exynos4 \
     lights.exynos4
 
-#    libgralloc_ump \
-#    libhwconverter \
-#    libfimg \
-#    hwcomposer.exynos4
-#    libhwjpeg \
-#    libhdmi \
-#    libfimc \
-#    libcec \
-#    libddc \
-#    libedid \
-#    libhdmiclient \
-#    libTVOut
-#    libtinyalsa \
-
 # NFC
 PRODUCT_PACKAGES += \
     libnfc \
@@ -118,9 +108,9 @@ PRODUCT_COPY_FILES += \
 
 # NFCEE access control
 ifeq ($(TARGET_BUILD_VARIANT),user)
-    NFCEE_ACCESS_PATH := device/samsung/i9300/nfcee_access.xml
+    NFCEE_ACCESS_PATH := $(LOCAL_PATH)/nfcee_access.xml
 else
-    NFCEE_ACCESS_PATH := device/samsung/i9300/nfcee_access_debug.xml
+    NFCEE_ACCESS_PATH := $(LOCAL_PATH)/nfcee_access_debug.xml
 endif
 
 PRODUCT_COPY_FILES += \
@@ -147,8 +137,8 @@ PRODUCT_PACKAGES += \
 #   libOMX.SEC.VP8.Decoder
 
 PRODUCT_COPY_FILES += \
-    device/samsung/i9300/configs/media_profiles.xml:system/etc/media_profiles.xml \
-    device/samsung/i9300/configs/media_codecs.xml:system/etc/media_codecs.xml
+    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \
+    $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml
 
 # RIL
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/init.smdk4x12.rc b/init.smdk4x12.rc
index ea1bab6..55cb50e 100755
--- a/init.smdk4x12.rc
+++ b/init.smdk4x12.rc
@@ -4,7 +4,7 @@ import init.bt.rc
 on early-init
     export EXTERNAL_STORAGE /storage/sdcard0
     export SECONDARY_STORAGE /storage/sdcard1
-    mkdir /storage 0050 system sdcard_r
+    mkdir /storage 0550 system sdcard_r
     mkdir /storage/sdcard0 0000 system system
     mkdir /storage/sdcard1 0775 system system
     mkdir /storage/usbdisk0 0775 system system
@@ -17,22 +17,14 @@ on early-init
     symlink /storage/usbdisk0 /usbdisk0
     symlink /storage/usbdisk0 /mnt/usbdisk0
 
-    symlink /efs /factory
-    mkdir /efs
-
-# ko files for exfat
-    insmod /system/lib/modules/exfat_core.ko
-    insmod /system/lib/modules/exfat_fs.ko
+    mkdir /efs 0771 radio system
 
 # ko files for FM Radio
     insmod /system/lib/modules/Si4709_driver.ko
 
 on fs
-    mount ext4 /dev/block/mmcblk0p9 /system ro wait noatime
-    mount ext4 /dev/block/mmcblk0p12 /data wait nosuid nodev noatime discard,noauto_da_alloc,journal_async_commit
-    mount ext4 /dev/block/mmcblk0p8 /cache nosuid nodev noatime journal_async_commit
-    mount ext4 /dev/block/mmcblk0p3 /efs nosuid nodev noatime wait journal_async_commit
-    
+    mount_all /fstab.smdk4x12
+
     setprop ro.crypto.fuse_sdcard true
     
     chown radio system /efs
@@ -92,6 +84,8 @@ on post-fs-data
     chown system radio /sys/class/flash/flash/flash_power
     write /data/ISP_CV 1
 
+	symlink /dev/block/mmcblk0p4 /dev/block/param
+
 # Permissions for bluetooth
     setprop ro.bt.bdaddr_path "/efs/bluetooth/bt_addr"
     chown bluetooth bluetooth ro.bt.bdaddr_path
@@ -447,7 +441,7 @@ service p2p_supplicant /system/bin/wpa_supplicant \
     oneshot
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-    -Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin \
+    -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \
     -c/data/misc/wifi/wpa_supplicant.conf
     #   we will start as root and wpa_supplicant will switch to user wifi
     #   after setting up the capabilities required for WEXT
diff --git a/init.trace.rc b/init.trace.rc
new file mode 100755
index 0000000..1d114f5
--- /dev/null
+++ b/init.trace.rc
@@ -0,0 +1,31 @@
+## Permissions to allow system-wide tracing to the kernel trace buffer.
+##
+on boot
+
+# Allow writing to the kernel trace log.
+    chmod 0222 /sys/kernel/debug/tracing/trace_marker
+
+# Allow the shell group to enable (some) kernel tracing.
+    chown root shell /sys/kernel/debug/tracing/trace_clock
+    chown root shell /sys/kernel/debug/tracing/buffer_size_kb
+    chown root shell /sys/kernel/debug/tracing/options/overwrite
+    chown root shell /sys/kernel/debug/tracing/events/sched/sched_switch/enable
+    chown root shell /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
+    chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
+    chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
+    chown root shell /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
+    chown root shell /sys/kernel/debug/tracing/tracing_on
+
+    chmod 0664 /sys/kernel/debug/tracing/trace_clock
+    chmod 0664 /sys/kernel/debug/tracing/buffer_size_kb
+    chmod 0664 /sys/kernel/debug/tracing/options/overwrite
+    chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_switch/enable
+    chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
+    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
+    chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable
+    chmod 0664 /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
+    chmod 0664 /sys/kernel/debug/tracing/tracing_on
+
+# Allow only the shell group to read and truncate the kernel trace.
+    chown root shell /sys/kernel/debug/tracing/trace
+    chmod 0660 /sys/kernel/debug/tracing/trace
diff --git a/overlay/packages/apps/Torch/res/values/config.xml b/overlay/packages/apps/Torch/res/values/config.xml
index 4a68271..39be64c 100644
--- a/overlay/packages/apps/Torch/res/values/config.xml
+++ b/overlay/packages/apps/Torch/res/values/config.xml
@@ -24,7 +24,7 @@
     <bool name="useCameraInterface">false</bool>
 
     <!-- Full path to the sysfs toggle -->
-    <string name="flashDevice">/sys/devices/virtual/flash/flash/flash_power</string>
+    <string name="flashDevice">/sys/devices/virtual/camera/flash/rear_flash</string>
 
     <!-- Lowest setting -->
     <integer name="valueOn">159</integer>
diff --git a/ueventd.smdk4x12.rc b/ueventd.smdk4x12.rc
index 70c913b..d617616 100644
--- a/ueventd.smdk4x12.rc
+++ b/ueventd.smdk4x12.rc
@@ -79,3 +79,4 @@
 /dev/ttyUSB0              0666   system     system
 /dev/usb/lp*              0660   system     usb
 /dev/block/mmcblk0p4	  0660	 system	    system
+/dev/block/mmcblk0p7	  0660	 system	    radio