14.1: Support unified tuna

Manifests/Manifest_LAOS-11.0.xml

@@ -67,9 +67,11 @@
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
 <!-- START OF DEVICE REPOS -->
+	<!-- Common -->
+	<project path="device/qcom/common" name="LineageOS/android_device_qcom_common" remote="github" revision="cm-11.0" />
+
 	<!-- ZTE AWE (n800) -->
 	<project path="device/zte/nex" name="spock1104/android_device_zte_nex" remote="github" revision="cm11_newkern" />
-	<project path="device/qcom/common" name="LineageOS/android_device_qcom_common" remote="github" revision="cm-11.0" />
 	<project path="kernel/zte/msm8930" name="spock1104/android_kernel_zte_msm8930" remote="github" revision="stockmod" />
 <!-- END OF DEVICE REPOS -->
 

Manifests/Manifest_LAOS-14.1.xml

@@ -21,7 +21,6 @@
 	<remove-project name="LineageOS/android_external_rsync" />
 	<remove-project name="LineageOS/android_external_unrar" />
 	<remove-project name="LineageOS/android_external_vim" />
-	<remove-project name="LineageOS/android_hardware_ti_omap4xxx" />
 	<remove-project name="LineageOS/android_packages_apps_Jelly" />
 	<remove-project name="LineageOS/android_packages_apps_LockClock" />
 	<remove-project name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />
@@ -50,8 +49,6 @@
 	<remove-project name="LineageOS/slackbot" />
 	<remove-project name="LineageOS/www" />
 	<remove-project name="platform/cts" />
-	<remove-project name="platform/hardware/ti/omap3" />
-	<remove-project name="platform/hardware/ti/omap4-aah" />
 	<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" />
@@ -79,6 +76,7 @@
 	<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/FlipFlap" name="LineageOS/android_packages_apps_FlipFlap" remote="github" />
+	<project path="external/jhead" name="LineageOS/android_external_jhead" 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" />
@@ -229,6 +227,11 @@
 	<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 Nexus Unified (maguro) -->
+	<project path="device/samsung/maguro" name="Galaxy-Nexus/android_device_samsung_maguro" remote="github" />
+	<project path="device/samsung/tuna" name="Galaxy-Nexus/android_device_samsung_tuna" remote="github" />
+	<project path="kernel/samsung/tuna" name="Galaxy-Nexus/android_kernel_samsung_tuna" 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" />

Patches/LineageOS-14.1/android_hardware_ti_omap4/0001-tuna-camera.patch

@@ -0,0 +1,64 @@
+From a683d613d24bb84ba029fa78e1d7722b0270c326 Mon Sep 17 00:00:00 2001
+From: Kyle Repinski <repinski23@gmail.com>
+Date: Fri, 9 Sep 2016 16:29:40 -0500
+Subject: [PATCH] camera: Move tuna DCC path to /data/misc/cameraserver/ on N.
+
+Change-Id: I2df1d33721508cfed33a8cd7f26194afcb54166a
+---
+ camera/OMXCameraAdapter/OMXDCC.cpp  | 3 ++-
+ domx/omx_core/inc/OMX_TI_IVCommon.h | 4 ++++
+ domx/omx_proxy_component/Android.mk | 6 ++++++
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/camera/OMXCameraAdapter/OMXDCC.cpp b/camera/OMXCameraAdapter/OMXDCC.cpp
+index 8e12e8b..beed9b3 100644
+--- a/camera/OMXCameraAdapter/OMXDCC.cpp
++++ b/camera/OMXCameraAdapter/OMXDCC.cpp
+@@ -27,12 +27,13 @@
+ #include "OMXDCC.h"
+ #include <utils/String8.h>
+ #include <utils/Vector.h>
++#include "OMX_TI_IVCommon.h"
+ 
+ namespace Ti {
+ namespace Camera {
+ 
+ #ifndef MOTOROLA_CAMERA
+-android::String8 DCCHandler::DCCPath("/data/misc/camera/");
++android::String8 DCCHandler::DCCPath(DCC_PATH);
+ #else
+ android::String8 DCCHandler::DCCPath("/system/etc/omapcam/");
+ #endif
+diff --git a/domx/omx_core/inc/OMX_TI_IVCommon.h b/domx/omx_core/inc/OMX_TI_IVCommon.h
+index 53ff447..07ae19e 100755
+--- a/domx/omx_core/inc/OMX_TI_IVCommon.h
++++ b/domx/omx_core/inc/OMX_TI_IVCommon.h
+@@ -53,7 +53,11 @@ extern "C" {
+ #include <OMX_IVCommon.h>
+ #include <OMX_Image.h>
+ 
++#if !(defined(DOMX_TUNA) && defined(ANDROID_API_N_OR_LATER))
+ #define DCC_PATH  "/data/misc/camera/"
++#else
++#define DCC_PATH  "/data/misc/cameraserver/"
++#endif
+ 
+ #define MAX_URI_LENGTH      (OMX_MAX_STRINGNAME_SIZE)
+ #define MAX_ALGOAREAS       (35)
+diff --git a/domx/omx_proxy_component/Android.mk b/domx/omx_proxy_component/Android.mk
+index 74dcec1..f2bfd39 100644
+--- a/domx/omx_proxy_component/Android.mk
++++ b/domx/omx_proxy_component/Android.mk
+@@ -170,6 +170,12 @@ ifdef OMAP_ENHANCEMENT_VTC
+ 	LOCAL_CFLAGS += -DOMAP_ENHANCEMENT_VTC
+ endif
+ 
++LOCAL_CFLAGS += -DTMS32060 -D_DB_TIOMAP -DSYSLINK_USE_SYSMGR -DSYSLINK_USE_LOADER
++LOCAL_CFLAGS += -D_Android -DSET_STRIDE_PADDING_FROM_PROXY -DANDROID_QUIRK_CHANGE_PORT_VALUES -DUSE_ENHANCED_PORTRECONFIG
++LOCAL_CFLAGS += -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION
++LOCAL_CFLAGS += $(ANDROID_API_CFLAGS)
++LOCAL_MODULE_TAGS:= optional
++
+ ifdef TI_CAMERAHAL_USES_LEGACY_DOMX_DCC
+ 	LOCAL_CFLAGS += -DUSES_LEGACY_DOMX_DCC
+ endif

Scripts/LineageOS-11.0/Patch.sh

@@ -71,7 +71,7 @@ enterAndClear "build";
 sed -i 's/Mms/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence
 sed -i '497i$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/base_rules.mk;
 sed -i '80iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package.mk;
-sed -i 's/2018-08-01/2018-12-01/' build/core/version_defaults.mk; #XXX: dirty lies! (kinda)
+sed -i 's/2018-08-01/2019-01-01/' build/core/version_defaults.mk; #XXX: dirty lies! (kinda)
 
 enterAndClear "external/sqlite";
 patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0)

Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/samsung/tuna"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9870/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9895/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8399/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0430/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15265/^4.14/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6074/^4.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7184/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
+git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
+editKernelLocalversion "-dos.p51"
+cd "$DOS_BUILD_BASE"

Scripts/LineageOS-14.1/Functions.sh

@@ -51,8 +51,9 @@ buildAll() {
 	#Select devices are userdebug due to SELinux policy issues
 	#TODO: Add athene, pme, t0lte, hlte, sumire, dogo, espresso
 	brunch lineage_clark-user;
-	brunch lineage_grouper-user; #deprecated and needs manual patching (one-repo vendor blob patch)
+	brunch lineage_maguro-user; #deprecated
 	brunch lineage_thor-userdebug; #deprecated
+	brunch lineage_grouper-user; #deprecated and needs manual patching (one-repo vendor blob patch)
 	#brunch lineage_geminipda-userdebug; #permissive and needs synced proprietary-files.txt
 	brunch lineage_h815-user; #deprecated
 	brunch lineage_herolte-user; #deprecated
@@ -71,7 +72,7 @@ buildAll() {
 	#brunch lineage_bacon-user;
 	#brunch lineage_d802-user;
 	#brunch lineage_d852-user;
-	brunch lineage_d855-user;
+	#brunch lineage_d855-user;
 	#brunch lineage_dragon-user;
 	#brunch lineage_ether-user;
 	#brunch lineage_flo-user;

Scripts/LineageOS-14.1/Patch.sh

@@ -100,6 +100,9 @@ awk -i inplace '!/mPermissionReviewRequired = Build.PERMISSIONS_REVIEW_REQUIRED/
 awk -i inplace '!/\|\| context.getResources\(\).getBoolean\(/' service/java/com/android/server/wifi/WifiServiceImpl.java;
 awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/' service/java/com/android/server/wifi/WifiServiceImpl.java;
 
+enterAndClear "hardware/ti/omap4";
+patch -p1 < "$DOS_PATCHES/android_hardware_ti_omap4/0001-tuna-camera.patch"; #fix camera on tuna
+
 enterAndClear "packages/apps/CMParts";
 rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml; #Nuke part of CMStats
 patch -p1 < "$DOS_PATCHES/android_packages_apps_CMParts/0001-Remove_Analytics.patch"; #Remove the rest of CMStats
@@ -215,6 +218,10 @@ rm board-info.txt; #Never restrict installation
 enterAndClear "device/oneplus/bacon";
 sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/
 
+enterAndCLear "device/samsung/tuna";
+rm setup-makefiles.sh; #broken, deblobber will still function
+sed -i 's/arm-eabi-4.7/arm-eabi-4.8/' BoardConfig.mk; #fix toolchain
+
 enter "vendor/google";
 echo "" > atv/atv-common.mk;