From c35393d9226bf4c7f36f5b37b2dc2c4a5d2197f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A0nh=20Ph=E1=BA=A1m?= <tienthanh.dqc@gmail.com>
Date: Sat, 13 May 2017 07:42:22 +0000
Subject: [PATCH 1/4] cm > linage

Change-Id: I9f2d2be0cd95cbdc503bdf86f17e8c36a4724fa4
---
 BoardConfig.mk                          | 3 ++-
 cm.dependencies => lineage.dependencies | 0
 cm.mk => lineage.mk                     | 4 ++--
 vendorsetup.sh                          | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename cm.dependencies => lineage.dependencies (100%)
 rename cm.mk => lineage.mk (94%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a4a0be5..72de35b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +46,7 @@ BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01000000 --tags_offset 0x00000100
 BOARD_KERNEL_IMAGE_NAME := zImage-dtb
 TARGET_KERNEL_APPEND_DTB := true
 TARGET_KERNEL_ARCH := arm
-TARGET_KERNEL_CONFIG := onyx_defconfig
+TARGET_KERNEL_CONFIG := lineageos_onyx_defconfig
 TARGET_KERNEL_SOURCE := kernel/oneplus/onyx
 
 # ANT+
diff --git a/cm.dependencies b/lineage.dependencies
similarity index 100%
rename from cm.dependencies
rename to lineage.dependencies
diff --git a/cm.mk b/lineage.mk
similarity index 94%
rename from cm.mk
rename to lineage.mk
index 4a6a246..46dde29 100644
--- a/cm.mk
+++ b/lineage.mk
@@ -18,13 +18,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from onyx device
 $(call inherit-product, device/oneplus/onyx/device.mk)
 
-# Inherit some common CM stuff.
+# Inherit some common Lineage stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Call the proprietary setup
 $(call inherit-product-if-exists, vendor/oneplus/onyx/onyx-vendor.mk)
 
-PRODUCT_NAME := cm_onyx
+PRODUCT_NAME := lineage_onyx
 PRODUCT_DEVICE := onyx
 PRODUCT_MANUFACTURER := OnePlus
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index f09eb01..57db6a7 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,3 @@
-add_lunch_combo cm_onyx-user
-add_lunch_combo cm_onyx-userdebug
-add_lunch_combo cm_onyx-eng
+add_lunch_combo lineage_onyx-user
+add_lunch_combo lineage_onyx-userdebug
+add_lunch_combo lineage_onyx-eng

From 7a45c0537fc0e2db91c2d6cdb5f56755f51db8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Ti=E1=BA=BFn=20Th=C3=A0nh?=
 <tienthanh.dqc@gmail.com>
Date: Mon, 14 Aug 2017 23:47:14 +0700
Subject: [PATCH 2/4] onyx: Kill Gello

---
 device.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device.mk b/device.mk
index 0ac84ce..21ec475 100644
--- a/device.mk
+++ b/device.mk
@@ -114,10 +114,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     OnyxDoze
 
-# Gello
-PRODUCT_PACKAGES += \
-    Gello
-
 # Graphics
 PRODUCT_PACKAGES += \
     copybit.msm8974 \

From 0f56770aa9af3489f10d960af3bda1beade378a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Ti=E1=BA=BFn=20Th=C3=A0nh?=
 <tienthanh.dqc@gmail.com>
Date: Mon, 14 Aug 2017 23:49:11 +0700
Subject: [PATCH 3/4] onyx: Ship with weather provider

---
 device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device.mk b/device.mk
index 21ec475..a244189 100644
--- a/device.mk
+++ b/device.mk
@@ -211,6 +211,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
 
+# Weather providers
+PRODUCT_PACKAGES += \
+    OpenWeatherMapWeatherProvider
+
 # WiFi
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \

From 29a33a6bbd959048964196bc4f9e16f3adef080b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Ti=E1=BA=BFn=20Th=C3=A0nh?=
 <tienthanh.dqc@gmail.com>
Date: Tue, 15 Aug 2017 08:14:48 +0700
Subject: [PATCH 4/4] Revert "onyx: Kill Gello"

This reverts commit 7a45c0537fc0e2db91c2d6cdb5f56755f51db8bd.
---
 device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device.mk b/device.mk
index a244189..0dd64cb 100644
--- a/device.mk
+++ b/device.mk
@@ -114,6 +114,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     OnyxDoze
 
+# Gello
+PRODUCT_PACKAGES += \
+    Gello
+
 # Graphics
 PRODUCT_PACKAGES += \
     copybit.msm8974 \