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 /cm.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 'cm.mk')
| -rw-r--r-- | cm.mk | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -2,18 +2,17 @@ PRODUCT_RELEASE_NAME := i9300 # Boot animation -TARGET_SCREEN_HEIGHT := 1280 -TARGET_SCREEN_WIDTH := 720 +TARGET_BOOTANIMATION_NAME := vertical-720x1280 # Inherit some common CM stuff. -$(call inherit-product, vendor/cm/config/common_full_phone.mk) +$(call inherit-product, vendor/replicant/config/common_full_phone.mk) # Inherit device configuration $(call inherit-product, device/samsung/i9300/full_i9300.mk) # Device identifier. This must come after all inclusions PRODUCT_DEVICE := i9300 -PRODUCT_NAME := cm_i9300 +PRODUCT_NAME := replicant_i9300 PRODUCT_BRAND := samsung PRODUCT_MODEL := GT-I9300 PRODUCT_MANUFACTURER := samsung |