From 9ed5178099f13970d6add23d4f28f3136de28ed8 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 27 Jan 2017 11:44:53 -0500
Subject: [PATCH] Add osprey

---
 Manifests/Manifest_LAOS-14.1.xml | 10 +++++++---
 Scripts/LAOS-14.1_Deblob.sh      |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 0654d234..5ff0261c 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -55,7 +55,6 @@
 	<remove-project name="platform/hardware/intel/sensors" />
 	<remove-project name="platform/hardware/ti/omap3" />
 	<remove-project name="platform/hardware/ti/omap4-aah" />
-	<!--<remove-project name="platform/packages/apps/Provision" />-->
 	<remove-project name="platform/prebuilts/clang/darwin-x86/host/3.6" />
 	<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
 	<remove-project name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" />
@@ -98,12 +97,10 @@
 <!-- START OF DEVICE REPOS -->
 	<!-- Common -->
 	<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" />
-	<project path="device/amazon/hdx-common" name="LineageOS/android_device_amazon_hdx-common" remote="github" />
 	<project path="device/oppo/common" name="LineageOS/android_device_oppo_common" remote="github" />
 	<project path="device/qcom/common" name="LineageOS/android_device_qcom_common" remote="github" />
 	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
 	<project path="hardware/sony/thermanager" name="LineageOS/android_hardware_sony_thermanager" remote="github" />
-	<project path="kernel/amazon/hdx-common" name="LineageOS/android_kernel_amazon_hdx-common" remote="github" />
 	<project path="kernel/google/msm" name="LineageOS/android_kernel_google_msm" remote="github" />
 
 	<!-- Nexus 4 (Mako) -->
@@ -131,7 +128,9 @@
 	<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
 
 	<!-- Amazon Kindle Fire HDX 7 3rd Gen (Thor)-->
+	<project path="device/amazon/hdx-common" name="LineageOS/android_device_amazon_hdx-common" remote="github" />
 	<project path="device/amazon/thor" name="LineageOS/android_device_amazon_thor" remote="github" />
+	<project path="kernel/amazon/hdx-common" name="LineageOS/android_kernel_amazon_hdx-common" remote="github" />
 
 	<!-- Asus Zenfone 2 Laser (Z00T) -->
 	<project name="LineageOS/android_device_asus_msm8916-common" path="device/asus/msm8916-common" remote="github" />
@@ -143,6 +142,11 @@
 	<project path="device/lge/vs985" name="LineageOS/android_device_lge_vs985" remote="github" />
 	<project path="kernel/lge/g3" name="LineageOS/android_kernel_lge_g3" remote="github" />
 
+	<!-- Moto G 3rd Gen (Osprey) -->
+	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
+	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
+	<project path="kernel/motorola/msm8916" name="LineageOS/android_kernel_motorola_msm8916" remote="github" />
+
 	<!-- Moto X Pure Edition (XT1575) -->
 	<project path="device/motorola/clark" name="LineageOS/android_device_motorola_clark" remote="github" />
 	<project path="kernel/motorola/msm8992" name="LineageOS/android_kernel_motorola_msm8992" remote="github" />
diff --git a/Scripts/LAOS-14.1_Deblob.sh b/Scripts/LAOS-14.1_Deblob.sh
index 429d9b61..031af606 100644
--- a/Scripts/LAOS-14.1_Deblob.sh
+++ b/Scripts/LAOS-14.1_Deblob.sh
@@ -103,6 +103,7 @@ deblob "device/amazon/hdx-common/" "proprietary-adreno-files.txt";
 deblob "device/amazon/hdx-common/" "proprietary-files.txt";
 deblob "device/asus/msm8916-common/" "proprietary-files.txt";
 deblob "device/lge/g3-common/" "proprietary-files.txt";
+deblob "device/motorola/msm8916-common/" "proprietary-files.txt";
 deblob "device/oppo/msm8974-common/" "device-proprietary-files.txt";
 deblob "device/oppo/msm8974-common/" "proprietary-files.txt";
 deblob "device/amazon/thor/" "proprietary-files.txt";
@@ -118,6 +119,7 @@ deblob "device/lge/mako/" "proprietary-blobs.txt";
 cd "vendor/lge/mako" && mv mako-vendor-blobs.mk mako-vendor.mk && echo "endif" >> Android.mk; #Creates malformed makefiles due to commit a85aa35fda31ef77b7424d0be108b0a5a2e71edf
 deblob "device/lge/vs985/" "proprietary-files.txt";
 deblob "device/motorola/clark/" "proprietary-files.txt";
+deblob "device/motorola/osprey/" "proprietary-files.txt";
 deblob "device/moto/shamu/" "device-proprietary-files.txt";
 deblob "device/moto/shamu/" "proprietary-blobs.txt";
 echo "vendor/lib/libcneapiclient.so" >> device/oneplus/bacon/proprietary-files-qc.txt; #Commit b7b6d94529e17ce51566aa6509cebab6436b153d disabled CNE but left this binary in the makefile vendor since NetMgr requires it. Without this line rerunning setup-makefiles.sh breaks cell service, since the resulting build will be missing it.