diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-17 18:37:41 +0100 |
| commit | 48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3 (patch) | |
| tree | 140491ed6e10eb1f61cad29c366ad9d7f2ccfbcd /i9300.mk | |
| parent | 170e8cf8f0608848e2acb354faf0d2203fb2d08a (diff) | |
| parent | 4ab492610e6f9654a4f51426d5e8f4871b338063 (diff) | |
| download | device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.zip device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.gz device_samsung_i9300-48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3.tar.bz2 | |
Merge remote-tracking branch 'replicant/replicant-4.2' into replicant-6.0
ril and vibrator do not work
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
cm.mk
i9300.mk
include/telephony/ril.h
init.smdk4x12.rc
overlay/frameworks/base/core/res/res/values/config.xml
system.prop
Diffstat (limited to 'i9300.mk')
| -rw-r--r-- | i9300.mk | 23 |
1 files changed, 19 insertions, 4 deletions
@@ -31,9 +31,24 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/fstab.smdk4x12:root/fstab.smdk4x12 \ $(LOCAL_PATH)/rootdir/init.target.rc:root/init.target.rc +# Keylayout +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/usr/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ + $(LOCAL_PATH)/usr/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \ + $(LOCAL_PATH)/usr/keylayout/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl + +# Idc +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \ + $(LOCAL_PATH)/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc + # Audio +PRODUCT_PACKAGES += \ + libaudio-ril-interface + PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0 + $(LOCAL_PATH)/audio/silence.wav:system/etc/sound/silence.wav # Sensors PRODUCT_PACKAGES += \ @@ -46,8 +61,6 @@ PRODUCT_COPY_FILES += \ # Product specific Packages PRODUCT_PACKAGES += \ - libsecril-client \ - libsecril-client-sap \ SamsungServiceMode \ tinyplay @@ -86,11 +99,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfc_extras -$(call inherit-product, vendor/cm/config/nfc_enhanced.mk) +$(call inherit-product, vendor/replicant/config/nfc_enhanced.mk) # RIL +PRODUCT_PACKAGES += \ + libsamsung-ril + PRODUCT_PROPERTY_OVERRIDES += \ - ro.telephony.ril_class=SamsungExynos4RIL \ ro.telephony.call_ring.multiple=false \ ro.telephony.call_ring.delay=3000 |