summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 15:36:04 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 15:36:04 +0100
commitdd53c447fc112f3b8b76d0a3310f9eac18509783 (patch)
treeb7ab8cc2bb7971fce0634147fa7dd8a468c897d4
parent3927cc21b303ab7dd054c808a41d210fcff002db (diff)
parent9940f36def99309af296f655e999ff12ec390550 (diff)
downloaddevice_samsung_i9300-dd53c447fc112f3b8b76d0a3310f9eac18509783.zip
device_samsung_i9300-dd53c447fc112f3b8b76d0a3310f9eac18509783.tar.gz
device_samsung_i9300-dd53c447fc112f3b8b76d0a3310f9eac18509783.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_device_samsung_i9300 into replicant-6.0replicant-6.0-beta-0002replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--BoardConfig.mk2
-rw-r--r--lineage.dependencies (renamed from cm.dependencies)0
-rw-r--r--lineage.mk (renamed from cm.mk)2
3 files changed, 2 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index df60137..51b4725 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,7 +36,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9300/bluetooth
# Kernel
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
-TARGET_KERNEL_CONFIG := cyanogenmod_i9300_defconfig
+TARGET_KERNEL_CONFIG := lineageos_i9300_defconfig
# Recovery
TARGET_RECOVERY_FSTAB := device/samsung/i9300/rootdir/fstab.smdk4x12
diff --git a/cm.dependencies b/lineage.dependencies
index a78a94f..a78a94f 100644
--- a/cm.dependencies
+++ b/lineage.dependencies
diff --git a/cm.mk b/lineage.mk
index 4403f67..116268c 100644
--- a/cm.mk
+++ b/lineage.mk
@@ -4,7 +4,7 @@ PRODUCT_RELEASE_NAME := i9300
# Boot animation
TARGET_BOOTANIMATION_NAME := vertical-720x1280
-# Inherit some common CM stuff.
+# Inherit some common stuff.
$(call inherit-product, vendor/replicant/config/common_full_phone.mk)
# Inherit device configuration