From f1f1cd1f5cac7e1ecc2081b00ad6e8e846a52cda Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Thu, 12 Sep 2019 18:53:11 +0100
Subject: [PATCH 01/15] LOS => AOSP

---
 AndroidProducts.mk                  | 2 +-
 lineage_osprey.mk => aosp_osprey.mk | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename lineage_osprey.mk => aosp_osprey.mk (88%)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index cf188fe..ca603a1 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_osprey.mk
+    $(LOCAL_DIR)/aosp_osprey.mk
 
diff --git a/lineage_osprey.mk b/aosp_osprey.mk
similarity index 88%
rename from lineage_osprey.mk
rename to aosp_osprey.mk
index 504a38b..9f8e119 100644
--- a/lineage_osprey.mk
+++ b/aosp_osprey.mk
@@ -16,13 +16,14 @@
 $(call inherit-product, device/motorola/osprey/full_osprey.mk)
 
 # Boot animation
-TARGET_BOOTANIMATION_HALF_RES := true
-TARGET_SCREEN_WIDTH := 720
-TARGET_SCREEN_HEIGHT := 1280
+TARGET_BOOT_ANIMATION_RES := 720
+
+TARGET_GAPPS_ARCH := arm
+TARGET_MINIMAL_APPS := true
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := osprey
-PRODUCT_NAME := lineage_osprey
+PRODUCT_NAME := aosp_osprey
 PRODUCT_MODEL := MotoG3
 PRODUCT_BRAND := Motorola
 PRODUCT_MANUFACTURER := Motorola

From 35842284c30c9fbafb432a436450bfeab0eb2338 Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Thu, 5 Sep 2019 12:40:30 +0100
Subject: [PATCH 02/15] osprey: Switch from add_lunch_combo to
 COMMON_LUNCH_CHOICES

---
 AndroidProducts.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ca603a1..d521b68 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,8 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_osprey.mk
 
+COMMON_LUNCH_CHOICES := \
+    aosp_osprey-user \
+    aosp_osprey-userdebug \
+    aosp_osprey-eng
+

From 930f52846fc8b432cf28a4916e4578ab32e8e90e Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Thu, 5 Sep 2019 12:43:22 +0100
Subject: [PATCH 03/15] osprey: Drop module eng tags

---
 rootdir/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 5cd1a15..7655817 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -4,7 +4,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.target.rc
-LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.target.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw

From 1add3936859d3e058017618c02609b345f910255 Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Thu, 12 Sep 2019 16:44:03 +0100
Subject: [PATCH 04/15] osprey: init: Convert makefile to blueprint

---
 init/Android.bp | 13 +++++++++++++
 init/Android.mk | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 init/Android.bp
 delete mode 100644 init/Android.mk

diff --git a/init/Android.bp b/init/Android.bp
new file mode 100644
index 0000000..96d8f5f
--- /dev/null
+++ b/init/Android.bp
@@ -0,0 +1,13 @@
+cc_library_static {
+    name: "libinit_osprey",
+    recovery_available: true,
+
+    include_dirs: ["system/core/init"],
+    cppflags: [
+        "-Wall",
+        "-DANDROID_TARGET=\"msm8916\"",
+    ],
+
+    srcs: ["init_osprey.cpp"],
+    static_libs: ["libbase"],
+}
diff --git a/init/Android.mk b/init/Android.mk
deleted file mode 100644
index 1e9900c..0000000
--- a/init/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := system/core/init
-LOCAL_CPPFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
-LOCAL_SRC_FILES := init_osprey.cpp
-LOCAL_MODULE := libinit_osprey
-LOCAL_STATIC_LIBRARIES := libbase
-
-include $(BUILD_STATIC_LIBRARY)

From 035e28ad3440d3d3caac6fd46a512cc0e41e8ce9 Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Thu, 12 Sep 2019 16:47:11 +0100
Subject: [PATCH 05/15] osprey: init: Get rid of board platform checking

* It serves no purpose.
---
 init/Android.bp      | 7 +++----
 init/init_osprey.cpp | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/init/Android.bp b/init/Android.bp
index 96d8f5f..6571bbb 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -2,10 +2,9 @@ cc_library_static {
     name: "libinit_osprey",
     recovery_available: true,
 
-    include_dirs: ["system/core/init"],
-    cppflags: [
-        "-Wall",
-        "-DANDROID_TARGET=\"msm8916\"",
+    include_dirs: [
+        "system/core/base/include",
+        "system/core/init",
     ],
 
     srcs: ["init_osprey.cpp"],
diff --git a/init/init_osprey.cpp b/init/init_osprey.cpp
index 3f87534..b8d4765 100644
--- a/init/init_osprey.cpp
+++ b/init/init_osprey.cpp
@@ -73,10 +73,6 @@ void vendor_load_properties()
     char fingerprint[PROP_VALUE_MAX];
     char tv[PROP_VALUE_MAX];
 
-    std::string platform = GetProperty("ro.board.platform","");
-    if (platform != ANDROID_TARGET)
-        return;
-
     // Warning-less way of sprintf(var, "");
     ds[0] = 0;
     tv[0] = 0;

From 509d96a3f3fd36791867d823b9caa8d6203e1d62 Mon Sep 17 00:00:00 2001
From: Kyle Harrison <khwebmail@gmail.com>
Date: Tue, 17 Sep 2019 14:17:14 +0100
Subject: [PATCH 06/15] msm8916-common: rootdir: Init cleanup

---
 rootdir/etc/init.target.rc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index d3051e1..c5cf1d4 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -76,7 +76,6 @@ on property:sys.boot_completed=1
     setprop sys.io.scheduler bfq
 
     write /sys/module/lpm_levels/parameters/sleep_disabled 0
-    write /sys/devices/system/cpu/cpu0/online 1
 
     # HMP scheduler settings
     write /proc/sys/kernel/sched_ravg_hist_size 3
@@ -123,8 +122,6 @@ on property:sys.boot_completed=1
     write /dev/cpuset/camera-daemon/cpus 0-3
     write /dev/cpuset/restricted/cpus 0-3
 
-    start batt_health
-
     write /sys/class/devfreq/1c00000.qcom,kgsl-3d0/governor "msm-adreno-tz"
     write /sys/class/devfreq/qcom,cpubw.30/governor "cpufreq"
 

From 166515a5e36d9d4b98f779156d350f982a03be61 Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 19:58:07 +0100
Subject: [PATCH 07/15] Update AndroidProducts.mk

aosp ==> colt
---
 AndroidProducts.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d521b68..200f160 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_osprey.mk
+    $(LOCAL_DIR)/colt_osprey.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_osprey-user \
-    aosp_osprey-userdebug \
-    aosp_osprey-eng
+    colt_osprey-user \
+    colt_osprey-userdebug \
+    colt_osprey-eng
 

From 7028dc922c4ff929e7ed28ecfdff67ec22893215 Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:00:12 +0100
Subject: [PATCH 08/15] Add files via upload

added colt_osprey.mk
---
 colt_osprey.mk | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 colt_osprey.mk

diff --git a/colt_osprey.mk b/colt_osprey.mk
new file mode 100644
index 0000000..f6e7937
--- /dev/null
+++ b/colt_osprey.mk
@@ -0,0 +1,30 @@
+# Copyright (C) 2015-2016 The CyanogenMod Project
+#           (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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$(call inherit-product, device/motorola/osprey/full_osprey.mk)
+
+# Boot animation
+TARGET_BOOT_ANIMATION_RES := 720
+
+TARGET_GAPPS_ARCH := arm
+TARGET_MINIMAL_APPS := true
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := osprey
+PRODUCT_NAME := colt_osprey
+PRODUCT_MODEL := MotoG3
+PRODUCT_BRAND := Motorola
+PRODUCT_MANUFACTURER := Motorola
+PRODUCT_RELEASE_NAME := osprey
\ No newline at end of file

From 6caaf5efddef8336878442f33d44ab1c89aa2f0c Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:01:12 +0100
Subject: [PATCH 09/15] Delete aosp_osprey.mk

aosp_osprey.mk  ==> colt_osprey.mk
---
 aosp_osprey.mk | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 aosp_osprey.mk

diff --git a/aosp_osprey.mk b/aosp_osprey.mk
deleted file mode 100644
index 9f8e119..0000000
--- a/aosp_osprey.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2015-2016 The CyanogenMod Project
-#           (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.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$(call inherit-product, device/motorola/osprey/full_osprey.mk)
-
-# Boot animation
-TARGET_BOOT_ANIMATION_RES := 720
-
-TARGET_GAPPS_ARCH := arm
-TARGET_MINIMAL_APPS := true
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := osprey
-PRODUCT_NAME := aosp_osprey
-PRODUCT_MODEL := MotoG3
-PRODUCT_BRAND := Motorola
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_RELEASE_NAME := osprey

From 4996843daf1d9182ab4c2b370d7594f691781152 Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:06:22 +0100
Subject: [PATCH 10/15] Add files via upload

lineage.dependencies ==> colt.dependencies
---
 colt.dependencies | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 colt.dependencies

diff --git a/colt.dependencies b/colt.dependencies
new file mode 100644
index 0000000..dd318da
--- /dev/null
+++ b/colt.dependencies
@@ -0,0 +1,7 @@
+
+[
+  {
+    "repository":  "android_device_motorola_msm8916-common",
+    "target_path": "device/motorola/msm8916-common"
+  }
+]

From 99ff83cbf7acfbce9023bda2bef92cb509c6375c Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:07:11 +0100
Subject: [PATCH 11/15] Update colt.dependencies

typo
---
 colt.dependencies | 1 -
 1 file changed, 1 deletion(-)

diff --git a/colt.dependencies b/colt.dependencies
index dd318da..740b634 100644
--- a/colt.dependencies
+++ b/colt.dependencies
@@ -1,4 +1,3 @@
-
 [
   {
     "repository":  "android_device_motorola_msm8916-common",

From 5a7f00fa17e31d84efed4e27028dbda49bd96dee Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:07:36 +0100
Subject: [PATCH 12/15] Delete lineage.dependencies

del
---
 lineage.dependencies | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 lineage.dependencies

diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 30b7919..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "repository":  "android_device_motorola_msm8916-common",
-    "target_path": "device/motorola/msm8916-common"
-  }
-]
-

From d38b7de000b6d3d6df6da4bff32b4a13563069bf Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:13:09 +0100
Subject: [PATCH 13/15] Update colt_osprey.mk

Change bootanimation-resolution
# Inherit some common Colt stuff
---
 colt_osprey.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/colt_osprey.mk b/colt_osprey.mk
index f6e7937..35d0279 100644
--- a/colt_osprey.mk
+++ b/colt_osprey.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/motorola/osprey/full_osprey.mk)
 
 # Boot animation
-TARGET_BOOT_ANIMATION_RES := 720
+TARGET_BOOT_ANIMATION_RES := 1080x1920 : Please change as per your device resolution
 
 TARGET_GAPPS_ARCH := arm
 TARGET_MINIMAL_APPS := true
@@ -27,4 +27,7 @@ PRODUCT_NAME := colt_osprey
 PRODUCT_MODEL := MotoG3
 PRODUCT_BRAND := Motorola
 PRODUCT_MANUFACTURER := Motorola
-PRODUCT_RELEASE_NAME := osprey
\ No newline at end of file
+PRODUCT_RELEASE_NAME := osprey
+
+# Inherit some common Colt stuff.
+$(call inherit-product, vendor/colt/config/common_full_phone.mk)

From 9b315575d5a677da7111ac62eba28c6b0d2a5186 Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:14:44 +0100
Subject: [PATCH 14/15] Update colt_osprey.mk

change res bootanimation
---
 colt_osprey.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/colt_osprey.mk b/colt_osprey.mk
index 35d0279..37a10da 100644
--- a/colt_osprey.mk
+++ b/colt_osprey.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/motorola/osprey/full_osprey.mk)
 
 # Boot animation
-TARGET_BOOT_ANIMATION_RES := 1080x1920 : Please change as per your device resolution
+TARGET_BOOT_ANIMATION_RES := 720×1280 : Please change as per your device resolution
 
 TARGET_GAPPS_ARCH := arm
 TARGET_MINIMAL_APPS := true

From 22d42e5920627a36093079bb863eb06832e3f325 Mon Sep 17 00:00:00 2001
From: Force225 <54151468+Force225@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:15:53 +0100
Subject: [PATCH 15/15] Update colt_osprey.mk

change res bootanimation
---
 colt_osprey.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/colt_osprey.mk b/colt_osprey.mk
index 37a10da..3c699d1 100644
--- a/colt_osprey.mk
+++ b/colt_osprey.mk
@@ -17,6 +17,7 @@ $(call inherit-product, device/motorola/osprey/full_osprey.mk)
 
 # Boot animation
 TARGET_BOOT_ANIMATION_RES := 720×1280 : Please change as per your device resolution
+# TARGET_BOOT_ANIMATION_RES := 1080x1920 : Please change as per your device resolution
 
 TARGET_GAPPS_ARCH := arm
 TARGET_MINIMAL_APPS := true