i9500: rebase branch cm-11.0 to Official CM Sources

BoardConfig.mk

@@ -41,11 +41,6 @@ TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_SMP := true
 TARGET_CPU_VARIANT := cortex-a15
-TARGET_GLOBAL_CFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=softfp
-TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=softfp
-
-# Enable QC's libm optimizations
-TARGET_USE_QCOM_BIONIC_OPTIMIZATION := true
 
 # Kernel
 BOARD_KERNEL_BASE := 0x10000000

cm.dependencies

@@ -6,5 +6,25 @@
     {
         "repository": "android_hardware_samsung",
         "target_path": "hardware/samsung"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_exynos",
+        "target_path": "hardware/samsung_slsi/exynos"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_exynos5-insignal",
+        "target_path": "hardware/samsung_slsi/exynos5-insignal"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_exynos5410",
+        "target_path": "hardware/samsung_slsi/exynos5410"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi_openmax",
+        "target_path": "hardware/samsung_slsi/openmax"
+    },
+    {
+        "repository": "android_kernel_samsung_exynos5410",
+        "target_path": "kernel/samsung/exynos5410"
     }
 ]

i9500.mk

@@ -38,31 +38,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     init.recovery.universal5410.rc
 
-# Synapse Init files
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/res/synapse:root/res/synapse \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.io:root/res/synapse/config.json.generate.io \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.qos:root/res/synapse/config.json.generate.qos \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions:root/res/synapse/actions \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/voltage:root/res/synapse/actions/voltage \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/gpuvolt:root/res/synapse/actions/gpuvolt \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/colour:root/res/synapse/actions/colour \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/cpuvolt:root/res/synapse/actions/cpuvolt \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/charge-source:root/res/synapse/actions/charge-source \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/bracket-option:root/res/synapse/actions/bracket-option \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/led:root/res/synapse/actions/led \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/generic.native:root/res/synapse/actions/generic.native \
-    $(LOCAL_PATH)/rootdir/res/synapse/actions/generic:root/res/synapse/actions/generic \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.cpu:root/res/synapse/config.json.generate.cpu \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.battery:root/res/synapse/config.json.generate.battery \
-    $(LOCAL_PATH)/rootdir/res/synapse/uci:root/res/synapse/uci \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.audio:root/res/synapse/config.json.generate.audio \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.gpu:root/res/synapse/config.json.generate.gpu \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.led:root/res/synapse/config.json.generate.led \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate.screen:root/res/synapse/config.json.generate.screen \
-    $(LOCAL_PATH)/rootdir/res/synapse/config.json.generate:root/res/synapse/config.json.generate \
-    $(LOCAL_PATH)/rootdir/sbin/perseus.sh:root/sbin/perseus.sh
-
 # Audio
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
@@ -117,8 +92,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     keystore.exynos5
 
-PRODUCT_TAGS += dalvik.gc.type-precise
-
 # Lights
 PRODUCT_PACKAGES += \
     lights.universal5410
@@ -187,15 +160,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.cwm.enable_key_repeat=true \
     ro.cwm.repeatable_keys=114,115
 
-# Props from Samsung ROM
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10
-
-# dex-opt to cache
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.dexopt-data-only=0
-
 # System properties
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.opengles.version=131072 \

keylayout/sec_touchkey.kl

@@ -1,2 +1,2 @@
-key 139   MENU		VIRTUAL
-key 158   BACK		VIRTUAL
+key 139   MENU        VIRTUAL
+key 158   BACK        VIRTUAL

overlay/frameworks/base/core/res/res/values/config.xml

@@ -254,7 +254,7 @@
     <!-- Indicate whether the SD card is accessible without removing the battery. -->
     <bool name="config_batterySdCardAccessibility">true</bool>
 
-    <!-- Boolean to enable stk functionality on Samsung phones -->
+    <!-- Boolean to enable STK functionality on Samsung phones -->
     <bool name="config_samsung_stk">true</bool>
 
 </resources>

rootdir/etc/init.universal5410.rc

@@ -2,9 +2,6 @@ import init.universal5410.usb.rc
 import init.universal5410.wifi.rc
 
 on init
-    chmod 0701 /mnt/media_rw
-    chown root root /mnt/media_rw
-
     start watchdogd
 
      # For Absolute Persistence Partition
@@ -19,12 +16,9 @@ on init
     chmod 0750 /persdata/absolute
 
     mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage 0550 system sdcard_r
     mkdir /storage/emulated 0555 root root
-    mkdir /storage/sdcard1 0775 system system
-    mkdir /storage/usbdisk 0775 system system
-    mkdir /mnt/media_rw/sdcard1 0775 system system
-    mkdir /mnt/media_rw/usbdisk 0775 system system
+    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
+    mkdir /mnt/media_rw/usbdisk 0700 media_rw media_rw
 
     mkdir /storage/sdcard1 0700 root root
     mkdir /storage/usbdisk 0700 root root
@@ -471,9 +465,9 @@ service pvrsrvctl /system/vendor/bin/pvrsrvctl --start --no-module
     oneshot
 
 # virtual sdcard daemon running as 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
+    oneshot
 
 service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -l /mnt/media_rw/sdcard1 /storage/sdcard1
     class late_start
@@ -512,12 +506,6 @@ service immvibed /system/bin/immvibed
     group shell
     oneshot
 
-# Synapse Kernel Control
-service perseusinit /sbin/perseus.sh
-    class core
-    user root
-    oneshot
-
 # SA, System SW, SAMSUNG
 service bugreport /system/bin/bugmailer.sh -v
     class main