aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BoardConfig.mk29
-rw-r--r--bluetooth/bdroid_buildcfg.h2
-rw-r--r--cm.mk6
-rw-r--r--configs/gps.conf102
-rw-r--r--i9305.mk43
-rw-r--r--proprietary-files.txt59
-rw-r--r--rootdir/fstab.smdk4x1223
-rw-r--r--rootdir/init.target.rc58
-rw-r--r--rootdir/lpm.rc71
-rw-r--r--system.prop14
10 files changed, 74 insertions, 333 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index fe15653..660414c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,11 +14,8 @@
# limitations under the License.
#
-# This variable is set first, so it can be overridden
-# by BoardConfigVendor.mk
-
--include device/samsung/smdk4412-common/BoardCommonConfig.mk
-include device/samsung/smdk4412-qcom-common/BoardCommonConfig.mk
+-include device/samsung/smdk4412-common/BoardCommonConfig.mk
LOCAL_PATH := device/samsung/i9305
@@ -26,7 +23,8 @@ LOCAL_PATH := device/samsung/i9305
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
# RIL
-COMMON_GLOBAL_CFLAGS += -DPROPERTY_PERMS_APPEND='{ "ril.ks.status", AID_SYSTEM, 0 },'
+BOARD_PROVIDES_LIBRIL := true
+BOARD_MODEM_TYPE := mdm9x35
# Camera
COMMON_GLOBAL_CFLAGS += -DCAMERA_WITH_CITYID_PARAM
@@ -42,27 +40,6 @@ RECOVERY_FSTAB_VERSION := 2
# assert
TARGET_OTA_ASSERT_DEVICE := m3,m3xx,i9305,GT-I9305
-# inherit from the proprietary version
--include vendor/samsung/i9305/BoardConfigVendor.mk
-
# Selinux
BOARD_SEPOLICY_DIRS += \
device/samsung/i9305/selinux
-
-BOARD_SEPOLICY_UNION += \
- file_contexts \
- te_macros \
- device.te \
- dhcp.te \
- domain.te \
- file.te \
- init.te \
- kickstart.te \
- mediaserver.te \
- netmgrd.te \
- qmux.te \
- rild.te \
- secril.te \
- system.te \
- ueventd.te \
- wpa_supplicant.te
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index c5597df..b0a2f04 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -18,7 +18,7 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "Galaxy S III LTE"
+#define BTM_DEF_LOCAL_NAME "GALAXY S3 LTE GT-I9305"
#define BLE_INCLUDED TRUE
#define BTA_GATT_INCLUDED TRUE
#define SMP_INCLUDED TRUE
diff --git a/cm.mk b/cm.mk
index 4fc3092..8ce223f 100644
--- a/cm.mk
+++ b/cm.mk
@@ -22,4 +22,8 @@ PRODUCT_MODEL := GT-I9305
PRODUCT_MANUFACTURER := samsung
# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m3xx TARGET_DEVICE=m3 BUILD_FINGERPRINT="samsung/m3xx/m3:4.1.2/JZO54K/I9305XXBMA6:user/release-keys" PRIVATE_BUILD_DESC="m3xx-user 4.1.2 JZO54K I9305XXBMA6 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ PRODUCT_NAME=m3xx \
+ TARGET_DEVICE=m3 \
+ BUILD_FINGERPRINT="samsung/m3xx/m3:4.4.4/KTU84P/I9305XXUFPB1:user/release-keys" \
+ PRIVATE_BUILD_DESC="m3xx-user 4.4.4 KTU84P I9305XXUFPB1 release-keys"
diff --git a/configs/gps.conf b/configs/gps.conf
deleted file mode 100644
index 6576285..0000000
--- a/configs/gps.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-#Test
-NTP_SERVER=time.gpsonextra.net
-#Asia
-# NTP_SERVER=asia.pool.ntp.org
-#Europe
-# NTP_SERVER=europe.pool.ntp.org
-#North America
-# NTP_SERVER=north-america.pool.ntp.org
-
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-# 4 - Debug, 5 - Verbose
-DEBUG_LEVEL = 4
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# supl version 1.0
-SUPL_VER=0x10000
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-# GPS Capabilities bit mask
-# SCHEDULING = 1
-# MSB = 2
-# MSA = 4
-# ULP = 0x20
-# ON_DEMAND_TIME = 0x10 // yunu.lee
-# default = MSA | MSB | SCHEDULING | ULP
-CAPABILITIES=0x16
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-################################
-# Sensor Settings
-################################
-
-# Needs to be set explicitly based on sensor
-# There is no default value.
-GYRO_BIAS_RANDOM_WALK=0.00001
-
-# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0)
-SENSOR_ACCEL_BATCHES_PER_SEC=3
-SENSOR_ACCEL_SAMPLES_PER_BATCH=5
-SENSOR_GYRO_BATCHES_PER_SEC=3
-SENSOR_GYRO_SAMPLES_PER_BATCH=5
-# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0)
-SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4
-SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25
-SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4
-SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
-
-# INS Filter Mode (0=Enable, 1=Disable)
-SENSOR_ALGORITHM_CONFIG_MASK=1
-
-# Sensor Control Mode (0=AUTO, 1=FORCE_ON)
-SENSOR_CONTROL_MODE=0
-
-# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
-SENSOR_USAGE=0
-
-# Choose GSIFF sensor provider (1=DSPS, 2=Android NDK)
-SENSOR_PROVIDER=2
-
-################################
-# Indoor Positioning Settings
-################################
-# 0: QUIPC disabled, 1: QUIPC enabled, 2: forced QUIPC only
-QUIPC_ENABLED = 0
-
-################################
-# EXTRA SETTINGS
-################################
-# Enable or Disable Wiper (1=Enable, 0=Disable)
-ENABLE_WIPER=0
-
-####################################
-# LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default) 1: Enable LPP_User_Plane on LTE
-LPP_PROFILE = 0
-
diff --git a/i9305.mk b/i9305.mk
index 572436e..c8d853a 100644
--- a/i9305.mk
+++ b/i9305.mk
@@ -19,10 +19,6 @@ LOCAL_PATH := device/samsung/i9305
# Overlay
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-# This device is xhdpi. However the platform doesn't
-# currently contain all of the bitmaps at xhdpi density so
-# we do this little trick to fall back to the hdpi version
-# if the xhdpi doesn't exist.
PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
PRODUCT_AAPT_PREF_CONFIG := xhdpi
@@ -30,25 +26,12 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/fstab.smdk4x12:root/fstab.smdk4x12 \
$(LOCAL_PATH)/rootdir/init.target.rc:root/init.target.rc \
- $(LOCAL_PATH)/rootdir/lpm.rc:root/lpm.rc \
$(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
# Audio
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m3
-# Camera
-PRODUCT_PACKAGES += \
- camera.smdk4x12
-
-# GPS
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf
-
-# Product specific Packages
-PRODUCT_PACKAGES += \
- DeviceSettings
-
# NFC
PRODUCT_PACKAGES += \
nfc.exynos4 \
@@ -57,6 +40,20 @@ PRODUCT_PACKAGES += \
Nfc \
Tag
+# RIL
+PRODUCT_PACKAGES += \
+ libsecril-client \
+ libsecril-client-sap
+
+# MM blobs
+PRODUCT_PACKAGES += \
+ libxml2 \
+ libprotobuf-cpp-full
+
+# Sensors
+PRODUCT_PACKAGES += \
+ sensors.smdk4x12
+
PRODUCT_COPY_FILES += \
packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt \
frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
@@ -77,19 +74,11 @@ PRODUCT_PACKAGES += \
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-# RIL
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.telephony.ril_class=SamsungQualcommRIL \
- mobiledata.interfaces=pdp0,wlan0,gprs,ppp0 \
- ro.telephony.ril.v3=newDriverCall,newDialCode
-
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
-# Include common makefile
-$(call inherit-product, device/samsung/smdk4412-common/common.mk)
+$(call inherit-product, vendor/samsung/i9305/i9305-vendor.mk)
$(call inherit-product, device/samsung/smdk4412-qcom-common/common.mk)
-
-$(call inherit-product-if-exists, vendor/samsung/i9305/i9305-vendor.mk)
+$(call inherit-product, device/samsung/smdk4412-common/common.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4e2a533..9682576 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,40 +1,37 @@
-system/bin/at_distributor
-system/bin/efsks
system/bin/ks
-system/bin/qcks
system/bin/qmiproxy
+system/bin/efsks
+system/bin/qcks
system/bin/qmuxd
-system/bin/rild
-system/bin/smdexe
-system/etc/Diag.cfg
system/etc/Diag_zero.cfg
-system/lib/libakm.so
-system/lib/libatparser.so
-system/lib/libcsd-client.so
-system/lib/libdiag.so
-system/lib/libdsi_netctrl.so
-system/lib/libdss.so
-system/lib/libdsutils.so
-system/lib/libfactoryutil.so
-system/lib/libidl.so
+system/etc/Diag.cfg
+system/etc/flp.conf
system/lib/libloc_api_v02.so
-system/lib/libnetmgr.so
-system/lib/libomission_avoidance.so
-system/lib/libqcci_legacy.so
-system/lib/libqdi.so
-system/lib/libqdp.so
-system/lib/libqmi.so
+system/lib/libfactoryutil.so
+system/lib/libril.so
+system/lib/liblbs_core.so
+system/lib/libcsd-client.so
+system/lib/libsecril-client.so
+system/lib/hw/flp.default.so
system/lib/libqmi_cci.so
+system/lib/libqmi.so
+system/lib/librilutils.so
+system/lib/libsec-ril.so
+system/lib/libgeofence.so
+system/lib/libsecnativefeature.so
+system/lib/libconfigdb.so
+system/lib/libqmi_encdec.so
+system/lib/libril-qcril-hook-oem.so
system/lib/libqmi_client_qmux.so
-system/lib/libqmi_common_so.so
+system/lib/libreference-ril.so
system/lib/libqmi_csi.so
-system/lib/libqmi_encdec.so
+system/lib/libizat_core.so
+system/lib/libdiag.so
+system/lib/libqmi_common_so.so
+system/lib/liblocationservice.so
system/lib/libqmiservices.so
-system/lib/libril.so
-system/lib/libril-qcril-hook-oem.so
-system/lib/libsecnativefeature.so
-system/lib/libsecril-client.so
-system/lib/libsec-ril.so
-system/lib/hw/sensors.smdk4x12.so
-system/usr/keylayout/sec_touchkey.kl
-
+system/lib/libcordon.so
+system/lib/libidl.so
+system/lib/libdsutils.so
+system/lib/libxml.so
+system/lib/libqcci_legacy.so
diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
index e54474f..375320d 100644
--- a/rootdir/fstab.smdk4x12
+++ b/rootdir/fstab.smdk4x12
@@ -3,19 +3,18 @@
# 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
# data partition must be located at the bottom for supporting device encryption
-
-/dev/block/mmcblk0p13 /system ext4 ro wait
-/dev/block/mmcblk0p3 /efs ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
-/dev/block/mmcblk0p12 /cache ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
-/dev/block/mmcblk0p11 /tombstones ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
-/dev/block/mmcblk0p10 /firmware vfat ro,shortname=lower,fmask=0133,dmask=0022,context=u:object_r:radio_efs_file:s0 wait
-/dev/block/mmcblk0p16 /data ext4 noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer
+/dev/block/platform/dw_mmc/by-name/SYSTEM /system ext4 ro wait
+/dev/block/platform/dw_mmc/by-name/EFS /efs ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
+/dev/block/platform/dw_mmc/by-name/CACHE /cache ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
+/dev/block/platform/dw_mmc/by-name/RADIO /firmware vfat ro,shortname=lower,fmask=0133,dmask=0022 wait
+/dev/block/platform/dw_mmc/by-name/USERDATA /data ext4 noatime,nosuid,nodev,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer
+/dev/block/platform/dw_mmc/by-name/TOMBSTONES /tombstones ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait,check
# vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1 auto auto defaults voldmanaged=sdcard1:auto
-/devices/platform/s5p-ehci auto auto defaults voldmanaged=usbdisk0:auto
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/platform/s5p-ehci* auto auto defaults voldmanaged=usb:auto,noemulatedsd
# recovery
-/dev/block/mmcblk0p8 /boot emmc defaults recoveryonly
-/dev/block/mmcblk0p9 /recovery emmc defaults recoveryonly
-/dev/block/mmcblk0p10 /modem emmc defaults recoveryonly
+/dev/block/platform/dw_mmc/by-name/BOOT /boot emmc defaults recoveryonly
+/dev/block/platform/dw_mmc/by-name/RECOVERY /recovery emmc defaults recoveryonly
+/dev/block/platform/dw_mmc/by-name/RADIO /modem emmc defaults recoveryonly
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index c2d8c5c..2f9b9ed 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -1,6 +1,7 @@
-import init.bt.rc
-
+###########################################################################################################
on init
+###########################################################################################################
+
# Vibetonz
export VIBE_PIPE_PATH /dev/pipes
mkdir /dev/pipes 0771 shell shell
@@ -36,11 +37,14 @@ on init
rmdir /tombstones/efs
mkdir /tombstones/efs 771 system system
+###########################################################################################################
on post-fs-data
+###########################################################################################################
+
chown system radio /dev/block/platform/dw_mmc/by-name
chmod 0775 /dev/block/platform/dw_mmc/by-name
- #QCRIL
+# QCRIL
#Create QMUX deamon socket area
mkdir /dev/socket/qmux_radio 0777 radio radio
chmod 2777 /dev/socket/qmux_radio
@@ -76,10 +80,6 @@ on post-fs-data
restorecon /tombstones/qcks/efs3.bin
restorecon /tombstones/qcks/temp.dump
- # for AT distributor
- chown system radio /sys/module/cpuidle_exynos4/parameters/enable_mask
- chmod 0664 /sys/module/cpuidle_exynos4/parameters/enable_mask
-
# Waketime fot fast dormancy
chown system radio /sys/devices/platform/mdm_hsic_pm0/waketime
chmod 0660 /sys/devices/platform/mdm_hsic_pm0/waketime
@@ -90,52 +90,21 @@ on post-fs-data
# make param block device link for SysScope
symlink /dev/block/mmcblk0p7 /dev/block/param
+###########################################################################################################
on boot
+###########################################################################################################
# SISO-ANDR_PERF :: START Changing scheduler to cfq and reseting cpu min freq to -1 after boot complete
on property:sys.boot_completed=1
write /sys/block/mmcblk0/queue/scheduler cfq
write /sys/power/cpufreq_min_limit -1
-# write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2
-# write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2
-# write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2
-# write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2
# SISO-ANDR_PERF :: END
-# AT Distributor for factory test
-service at_distributor /system/bin/at_distributor
- class late_start
- user root
- group radio log
-
-# diag app for cp uart
-service diag_uart_log /system/bin/diag_uart_log
- class main
- user root
- group radio
-
-service netmgrd /system/bin/netmgrd
- class late_start
-
-service SMD-daemon /system/bin/smdexe
- class main
- user root
- group system radio inet net_raw
-
service qc_kickstart /system/bin/qcks s
class core
user root
- seclabel u:r:kickstart:s0
group radio cache inet misc audio sdcard_rw log
-service ril-daemon /system/bin/rild
- class main
- socket rild stream 666 root radio
- socket rild-debug stream 666 radio system
- user root
- group radio cache inet misc audio sdcard_rw qcom_oncrpc diag log sdcard_r
-
-#For EncryptionMode - remove disabled, Modify class main
service qmiproxy /system/bin/qmiproxy
class main
user radio
@@ -146,12 +115,3 @@ service qmuxd /system/bin/qmuxd
user root
seclabel u:r:qmux:s0
group radio log audio bluetooth gps log
-
-# TVout
-service TvoutService_C /system/bin/bintvoutservice
- class main
- user system
- group graphics
-
-on property:ro.tvout.enable=false
- stop TvoutService_C
diff --git a/rootdir/lpm.rc b/rootdir/lpm.rc
deleted file mode 100644
index 7285736..0000000
--- a/rootdir/lpm.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-on early-init
- start ueventd
-
-on init
- export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
- export LD_LIBRARY_PATH /vendor/lib:/system/lib
- export ANDROID_ROOT /system
- export ANDROID_DATA /data
- export EXTERNAL_STORAGE /sdcard
-
- symlink /system/etc /etc
-
- mkdir /sdcard
- mkdir /preload
- mkdir /system
- mkdir /data
- mkdir /cache
- mkdir /efs
- mkdir /tmp
- mkdir /dbdata
- mkdir /mnt 0775 root root
- #mount /tmp /tmp tmpfs
-
-on early-fs
- mount ext4 /dev/block/mmcblk0p13 /system ro wait noatime
-
- mkdir /data/log 0777
- chmod 0666 /dev/log/radio
- chmod 0666 /dev/log/main
- chmod 0666 /dev/log/event
-
-on boot
-# write /sys/class/sec/switch/usb_sel PDA
-
-# CPU Frequency Governor
- write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor pegasusq
-
-# EHCI runtime enable for LPA
- write /sys/devices/platform/s5p-ehci/power/control auto
-
- ifup lo
- hostname localhost
- domainname localdomain
-
- class_start default
-
-service debuggerd /system/bin/debuggerd
-
-service ueventd /sbin/ueventd
- critical
-
-service console /system/bin/sh
- console
-
-service lpm /system/bin/lpm
- user root
-
-# adbd is controlled by the persist.service.adb.enable system property
-service adbd /sbin/adbd
- disabled
-
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
- start adbd
-
-on property:persist.service.adb.enable=1
- start adbd
-
-on property:persist.service.adb.enable=0
- stop adbd
-
diff --git a/system.prop b/system.prop
index 75d1685..37d0bf8 100644
--- a/system.prop
+++ b/system.prop
@@ -6,18 +6,6 @@ rild.libpath=/system/lib/libsec-ril.so
rild.libargs=-d /dev/ttyS0
ro.telephony.default_network=9
telephony.lteOnGsmDevice=1
-
+ro.ril.telephony.mqanelements=6
ro.sf.lcd_density=320
ro.lcd_min_brightness=20
-
-# System property ril adb log on
-persist.radio.adb_log_on=1
-
-# For sys info indication
-persist.radio.add_power_save=1
-
-# System property for SIM
-persist.radio.apm_sim_not_pwdn=1
-
-# System property for number of mQANElements
-ro.ril.telephony.mqanelements=6