From a42e8a524377a9f8c08c513040d92995a7d52d9d Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 5 Nov 2017 13:56:37 -0500
Subject: [PATCH] Add initial support for 7 more devices

---
 Manifests/Manifest_LAOS-14.1.xml              | 123 ++++++++++++------
 .../LineageOS-14.1/android_vendor_cm/sce.mk   |   4 -
 Scripts/LineageOS-14.1/Patch.sh               |   5 -
 3 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 307b772b..f06a3309 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -71,10 +71,6 @@
 	<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
-<!-- START OF CUSTOM REPOS -->
-	<remote name="dos" fetch="ssh://gitea@gogs.spotco.us:2222/DivestOS/" />
-<!-- END OF CUSTOM REPOS -->
-
 <!-- START OF ADDITIONAL REPOS -->
 	<!-- MicroG -->
 	<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
@@ -94,7 +90,6 @@
 	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
 
 	<!-- Misc -->
-	<project path="packages/apps/offline-calendar" name="SufficientlySecure/offline-calendar" remote="github" revision="master" />
 	<project path="packages/apps/Silence" name="SilenceIM/Silence" remote="github" revision="master" />
 <!-- END OF ADDITIONAL REPOS -->
 
@@ -102,46 +97,13 @@
 <!-- START OF DEVICE REPOS -->
 	<!-- Common -->
 	<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" 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="external/sony/boringssl-compat" name="LineageOS/android_external_sony_boringssl-compat" remote="github" />
 	<project path="hardware/sony/thermanager" name="LineageOS/android_hardware_sony_thermanager" remote="github" />
 	<project path="hardware/sony/timekeep" name="LineageOS/android_hardware_sony_timekeep" remote="github" />
+	<project path="external/stlport" name="LineageOS/android_external_stlport" remote="github" />
 	<project path="kernel/google/msm" name="LineageOS/android_kernel_google_msm" remote="github" />
-	<project path="packages/apps/SamsungServiceMode" name="LineageOS/android_packages_apps_SamsungServiceMode" remote="github" />
-
-	<!-- Nexus 7 2013 (flo) -->
-	<project path="device/asus/flo" name="LineageOS/android_device_asus_flo" remote="github" />
-
-	<!-- Nexus 9 (flounder) -->
-	<project path="device/htc/flounder" name="LineageOS/android_device_htc_flounder" remote="github" />
-	<project path="kernel/htc/flounder" name="LineageOS/android_kernel_htc_flounder" remote="github" />
-
-	<!-- Nexus 4 (mako) -->
-	<project path="device/lge/mako" name="LineageOS/android_device_lge_mako" remote="github" />
-	<project path="kernel/lge/mako" name="LineageOS/lge-kernel-mako" remote="github" />
-
-	<!-- Nexus 5 (hammerhead) -->
-	<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
-	<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />
-
-	<!-- Nexus 6 (shamu) -->
-	<project path="device/moto/shamu" name="LineageOS/android_device_moto_shamu" remote="github" />
-	<project path="kernel/moto/shamu" name="LineageOS/android_kernel_moto_shamu" remote="github" />
-
-	<!-- Nexus 5X (bullhead) -->
-	<project path="device/lge/bullhead" name="LineageOS/android_device_lge_bullhead" remote="github" />
-	<project path="kernel/lge/bullhead" name="LineageOS/android_kernel_lge_bullhead" remote="github" />
-
-	<!-- Nexus 6P (angler) -->
-	<project path="device/huawei/angler" name="LineageOS/android_device_huawei_angler" remote="github" />
-	<project path="kernel/huawei/angler" name="LineageOS/android_kernel_huawei_angler" remote="github" />
-
-	<!-- Google Pixel (marlin/sailfish) -->
-	<project path="device/google/marlin" name="LineageOS/android_device_google_marlin" remote="github" />
-	<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />
-	<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
+	<project path="packages/apps/FlipFlap" name="LineageOS/android_packages_apps_FlipFlap" 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" />
@@ -157,6 +119,22 @@
 	<project path="device/fairphone/FP2" name="LineageOS/android_device_fairphone_FP2" remote="github" />
 	<project path="kernel/fairphone/msm8974" name="LineageOS/android_kernel_fairphone_msm8974" remote="github" />
 
+	<!-- Google Pixel (marlin/sailfish) -->
+	<project path="device/google/marlin" name="LineageOS/android_device_google_marlin" remote="github" />
+	<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />
+	<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
+
+	<!-- HTC One (m8) -->
+	<project path="device/htc/m8" name="LineageOS/android_device_htc_m8" remote="github" />
+	<project path="device/htc/m8-common" name="LineageOS/android_device_htc_m8-common" remote="github" />
+	<project path="device/htc/msm8974-common" name="LineageOS/android_device_htc_msm8974-common" remote="github" />
+	<project path="kernel/htc/msm8974" name="LineageOS/android_kernel_htc_msm8974" remote="github" />
+
+	<!-- HTC One (m9) -->
+	<project path="device/htc/himaul" name="LineageOS/android_device_htc_himaul" remote="github" />
+	<project path="device/htc/hima-common" name="LineageOS/android_device_htc_hima-common" remote="github" />
+	<project path="kernel/htc/msm8994" name="LineageOS/android_kernel_htc_msm8994" 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" />
@@ -170,16 +148,77 @@
 	<project path="device/nextbit/ether" name="LineageOS/android_device_nextbit_ether" remote="github" />
 	<project path="kernel/nextbit/msm8992" name="LineageOS/android_kernel_nextbit_msm8992" remote="github" />
 
+	<!-- Nexus 4 (mako) -->
+	<project path="device/lge/mako" name="LineageOS/android_device_lge_mako" remote="github" />
+	<project path="kernel/lge/mako" name="LineageOS/lge-kernel-mako" remote="github" />
+
+	<!-- Nexus 7 2013 (flo) -->
+	<project path="device/asus/flo" name="LineageOS/android_device_asus_flo" remote="github" />
+
+	<!-- Nexus 5 (hammerhead) -->
+	<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
+	<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />
+
+	<!-- Nexus 6 (shamu) -->
+	<project path="device/moto/shamu" name="LineageOS/android_device_moto_shamu" remote="github" />
+	<project path="kernel/moto/shamu" name="LineageOS/android_kernel_moto_shamu" remote="github" />
+
+	<!-- Nexus 9 (flounder) -->
+	<project path="device/htc/flounder" name="LineageOS/android_device_htc_flounder" remote="github" />
+	<project path="kernel/htc/flounder" name="LineageOS/android_kernel_htc_flounder" remote="github" />
+
+	<!-- Nexus 5X (bullhead) -->
+	<project path="device/lge/bullhead" name="LineageOS/android_device_lge_bullhead" remote="github" />
+	<project path="kernel/lge/bullhead" name="LineageOS/android_kernel_lge_bullhead" remote="github" />
+
+	<!-- Nexus 6P (angler) -->
+	<project path="device/huawei/angler" name="LineageOS/android_device_huawei_angler" remote="github" />
+	<project path="kernel/huawei/angler" name="LineageOS/android_kernel_huawei_angler" remote="github" />
+
 	<!-- OnePlus One (bacon) -->
+	<project path="device/oppo/common" name="LineageOS/android_device_oppo_common" remote="github" />
 	<project path="device/oneplus/bacon" name="LineageOS/android_device_oneplus_bacon" remote="github" />
 	<project path="device/oppo/msm8974-common" name="LineageOS/android_device_oppo_msm8974-common" remote="github" />
 	<project path="kernel/oneplus/msm8974" name="LineageOS/android_kernel_oneplus_msm8974" remote="github" />
 
+	<!-- Samsung Common -->
+	<project path="device/samsung/qcom-common" name="LineageOS/android_device_samsung_qcom-common" remote="github" />
+	<project path="device/samsung/smdk4412-common" name="LineageOS/android_device_samsung_smdk4412-common" remote="github" />
+	<project path="device/samsung/smdk4412-qcom-common" name="LineageOS/android_device_samsung_smdk4412-qcom-common" remote="github" />
+	<project path="hardware/samsung" name="LineageOS/android_hardware_samsung" remote="github" />
+	<project path="kernel/samsung/smdk4412" name="LineageOS/android_kernel_samsung_smdk4412" remote="github" />
+	<project path="packages/apps/SamsungServiceMode" name="LineageOS/android_packages_apps_SamsungServiceMode" remote="github" />
+
 	<!-- Samsung Galaxy Note 8.0 Wi-Fi (n5110) -->
 	<project path="device/samsung/kona-common" name="LineageOS/android_device_samsung_kona-common" remote="github" />
 	<project path="device/samsung/n5110" name="LineageOS/android_device_samsung_n5110" remote="github" />
-	<project path="device/samsung/smdk4412-common" name="LineageOS/android_device_samsung_smdk4412-common" remote="github" />
-	<project path="kernel/samsung/smdk4412" name="LineageOS/android_kernel_samsung_smdk4412" remote="github" />
+
+	<!-- Samsung Galaxy S II (i9100) -->
+	<project path="device/samsung/i9100" name="LineageOS/android_device_samsung_i9100" remote="github" />
+	<project path="kernel/samsung/galaxys2-common" name="LineageOS/android_device_samsung_galaxys2-common" remote="github" />
+
+	<!-- Samsung Galaxy S III (i9305) -->
+	<project path="device/samsung/i9305" name="LineageOS/android_device_samsung_i9305" remote="github" />
+
+	<!-- Samsung Galaxy S4 (jfltexx) -->
+	<project path="device/samsung/jfltexx" name="LineageOS/android_device_samsung_jfltexx" remote="github" />
+	<project path="device/samsung/jf-common" name="LineageOS/android_device_samsung_jf-common" remote="github" />
+	<project path="kernel/samsung/jf" name="LineageOS/android_kernel_samsung_jf" remote="github" />
+
+	<!-- Samsung Galaxy S5 (klte) -->
+	<project path="device/samsung/klte" name="LineageOS/android_device_samsung_klte" remote="github" />
+	<project path="device/samsung/klte-common" name="LineageOS/android_device_samsung_klte-common" remote="github" />
+	<project path="device/samsung/msm8974-common" name="LineageOS/android_device_samsung_msm8974-common" remote="github" />s
+	<project path="kernel/samsung/msm8974" name="LineageOS/android_kernel_samsung_msm8974" remote="github" />
+
+	<!-- Samsung Galaxy S7 (herolte) -->
+	<project path="device/samsung/herolte" name="LineageOS/android_device_samsung_herolte" remote="github" />
+	<project path="device/samsung/hero-common" name="LineageOS/android_device_samsung_hero-common" remote="github" />
+	<project path="hardware/samsung_slsi-cm/exynos" name="LineageOS/android_hardware_samsung_slsi-cm_exynos" remote="github" />
+	<project path="hardware/samsung_slsi-cm/exynos5" name="LineageOS/android_hardware_samsung_slsi-cm_exynos5" remote="github" />
+	<project path="hardware/samsung_slsi-cm/exynos8890" name="LineageOS/android_hardware_samsung_slsi-cm_exynos8890" remote="github" />
+	<project path="hardware/samsung_slsi-cm/openmax" name="LineageOS/android_hardware_samsung_slsi-cm_openmax" remote="github" />
+	<project path="kernel/samsung/universal8890" name="LineageOS/android_kernel_samsung_universal8890" remote="github" />
 
 	<!-- Proprietary Blobs -->
 	<project path="vendor/amazon" name="TheMuppets/proprietary_vendor_amazon" remote="github" />
diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
index c682838d..8a7230a7 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
+++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
@@ -10,7 +10,3 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     F-Droid \
     FDroidPrivilegedExtension
-
-# Offline Calendar
-#PRODUCT_PACKAGES += \
-#    OfflineCalendar
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index b938a120..bbb98682 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -184,11 +184,6 @@ enter "packages/apps/Nfc"
 sed -i 's/static final boolean NFC_ON_DEFAULT = true;/static final boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC by default
 sed -i 's/static final boolean NDEF_PUSH_ON_DEFAULT = true;/static final boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push by default
 
-enter "packages/apps/offline-calendar"
-cp $patches"offline-calendar/Android.mk" Android.mk #Add a build file
-sed -i 's/compileSdkVersion 23/compileSdkVersion 25/' Offline-Calendar/build.gradle;
-sed -i 's/buildToolsVersion "23.0.3"/buildToolsVersion "25.0.3"/' Offline-Calendar/build.gradle;
-
 enter "packages/apps/Settings"
 sed -i 's/Settings.Secure.WEB_ACTION_ENABLED, 1/Settings.Secure.WEB_ACTION_ENABLED, 0/' src/com/android/settings/applications/ManageDomainUrls.java; #Disable "Instant Apps"
 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length