Git-Mirrors
/
DivestOS
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixups 

- Revert Freetype branch switching for 15.1+, broken
- Don't include OpenEUICC on Pixel 2 and 3 series, they won't work
- Churn

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-24 01:17:08 -04:00
parent 1fde0f9c45
commit 52a0c55c41
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
11 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Manifests/Manifest_LAOS-15.1.xml
View File

@ -74,8 +74,6 @@
<!-- use newer branches -->
<remove-project name="LineageOS/android_external_aac" />
<project path="external/aac" name="LineageOS/android_external_aac" remote="github" revision="lineage-17.1" />
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="LineageOS/android_external_freetype" remote="github" revision="lineage-18.1" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

7
Manifests/Manifest_LAOS-16.0.xml
View File

@ -72,8 +72,6 @@
<!-- use newer branches -->
<remove-project name="LineageOS/android_external_aac" />
<project path="external/aac" name="LineageOS/android_external_aac" remote="github" revision="lineage-17.1" />
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="LineageOS/android_external_freetype" remote="github" revision="lineage-18.1" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->
@ -100,10 +98,6 @@
<project path="kernel/google/yellowstone" name="LineageOS/android_kernel_google_yellowstone" remote="github" />
<project path="hardware/nvidia/libstagefrighthw" name="LineageOS/android_hardware_nvidia_libstagefrighthw" 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" />
<!-- Samsung Galaxy S5 Plus (kccat6) -->
<project path="device/samsung/kccat6" name="LineageOS/android_device_samsung_kccat6" remote="github" />
<project path="device/samsung/apq8084-common" name="LineageOS/android_device_samsung_apq8084-common" remote="github" />
@ -124,7 +118,6 @@
<!-- Proprietary Blobs -->
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" />
<project path="vendor/lge" name="[COLOUR IN THE LINES]/proprietary_vendor_lge" remote="github" />
<project path="vendor/samsung" name="[COLOUR IN THE LINES]/proprietary_vendor_samsung" remote="github" />
<project path="vendor/wileyfox" name="[COLOUR IN THE LINES]/proprietary_vendor_wileyfox" remote="github" />
<project path="vendor/zuk" name="[COLOUR IN THE LINES]/proprietary_vendor_zuk" remote="github" />

4
Manifests/Manifest_LAOS-17.1.xml
View File

@ -65,10 +65,6 @@
<!-- Switch to the Mulch WebView -->
<remove-project name="LineageOS/android_external_chromium-webview" />
<project path="external/chromium-webview" name="divested-mobile/mulch" groups="pdk" clone-depth="1" remote="gitlab" revision="master" />
<!-- use newer branches -->
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="LineageOS/android_external_freetype" remote="github" revision="lineage-18.1" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

2
Patches/LineageOS-14.1/android_external_aac/0001-makefile.patch
View File

@ -1,4 +1,4 @@
From a7a13d846ec35cbab5acbac9580679eb1878be8f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: syphyr <syphyr@gmail.com>
Date: Mon, 13 Jun 2022 20:18:46 +0200
Subject: [PATCH] Backport Makefile for Nougat

2
Patches/LineageOS-14.1/android_external_freetype/0001-makefile.patch
View File

@ -1,4 +1,4 @@
From 4cbccba5585d15b6763fe581e58ce953fbfd0a6a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: syphyr <syphyr@gmail.com>
Date: Tue, 8 Aug 2023 23:58:29 +0200
Subject: [PATCH] Add Android.mk for legacy builds

6
Patches/LineageOS-14.1/android_frameworks_base/364029-backport.patch
View File

@ -15,8 +15,8 @@ Change-Id: Iac6baa889965b8ffecd9a43179a4c96632ad1d02
---
core/java/android/app/ActivityManager.java | 3 ++
core/res/AndroidManifest.xml | 6 +++-
.../server/am/ActivityManagerService.java | 33 +++++++++++++++++--
3 files changed, 39 insertions(+), 3 deletions(-)
.../server/am/ActivityManagerService.java | 32 +++++++++++++++++--
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index da7d711194de..9f6e25c74386 100644
@ -33,6 +33,7 @@ index da7d711194de..9f6e25c74386 100644
* {@link android.Manifest.permission#KILL_BACKGROUND_PROCESSES} to be able to
* call this method.
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0f224dae3337..ef6ce2503061 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1741,7 +1741,11 @@
@ -49,6 +50,7 @@ diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-->
<permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 8f26804d51bd..a96ad5e24399 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5819,8 +5819,20 @@ public final class ActivityManagerService extends ActivityManagerNative

21
Scripts/Common/Functions.sh
View File

@ -723,16 +723,19 @@ export -f disableAPEX;
includeOE() {
cd "$DOS_BUILD_BASE/$1";
if [ -f device.mk ]; then
if grep -sq "euicc.xml" device.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device.mk;
echo "Enabled OpenEUICC inclusion for $1";
#Skip: Pixel 2 series (only supports Google Fi), Pixel 3/a series (broken on 20.0)
if [[ "$1" != *"device/google/bonito"* ]] && [[ "$1" != *"device/google/crosshatch"* ]] && [[ "$1" != *"device/google/wahoo"* ]]; then
if [ -f device.mk ]; then
if grep -sq "euicc.xml" device.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device.mk;
echo "Enabled OpenEUICC inclusion for $1";
fi;
fi;
fi;
if [ -f device-lineage.mk ]; then
if grep -sq "euicc.xml" device-lineage.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device-lineage.mk;
echo "Enabled OpenEUICC inclusion for $1";
if [ -f device-lineage.mk ]; then
if grep -sq "euicc.xml" device-lineage.mk; then
echo -e "\nPRODUCT_PACKAGES += OpenEUICC" >> device-lineage.mk;
echo "Enabled OpenEUICC inclusion for $1";
fi;
fi;
fi;
cd "$DOS_BUILD_BASE";

6
Scripts/LineageOS-15.1/Patch.sh
View File

@ -114,9 +114,9 @@ applyPatch "$DOS_PATCHES/android_external_expat/337989-backport.patch"; #n-asb-2
applyPatch "$DOS_PATCHES/android_external_expat/348649.patch"; #n-asb-2023-02 Fix overeager DTD destruction (fixes #649)
fi;
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#fi;
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
fi;
#if [ "$DOS_GRAPHENE_MALLOC_BROKEN" = true ]; then
#if enterAndClear "external/hardened_malloc"; then

6
Scripts/LineageOS-16.0/Patch.sh
View File

@ -138,10 +138,10 @@ git fetch https://github.com/LineageOS/android_external_expat refs/changes/56/33
git fetch https://github.com/LineageOS/android_external_expat refs/changes/28/349328/1 && git cherry-pick FETCH_HEAD; #P_asb_2023-02
fi;
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#applyPatch "$DOS_PATCHES/android_external_freetype/364028-backport.patch"; #R_asb_2023-08 Cherrypick following three changes #XXX: needs fix
#fi;
fi;
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
if enterAndClear "external/hardened_malloc"; then

8
Scripts/LineageOS-17.1/Patch.sh
View File

@ -124,10 +124,10 @@ if enterAndClear "external/conscrypt"; then
if [ "$DOS_GRAPHENE_CONSTIFY" = true ]; then applyPatch "$DOS_PATCHES/android_external_conscrypt/0001-constify_JNINativeMethod.patch"; fi; #Constify JNINativeMethod tables (GrapheneOS)
fi;
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#applyPatch "$DOS_PATCHES/android_external_freetype/364028-backport.patch"; #R_asb_2023-08 Cherrypick following three changes
#fi;
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
applyPatch "$DOS_PATCHES/android_external_freetype/364028-backport.patch"; #R_asb_2023-08 Cherrypick following three changes
fi;
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
if enterAndClear "external/hardened_malloc"; then

2
Scripts/init.sh
View File

@ -23,7 +23,7 @@
#General
export DOS_WORKSPACE_ROOT="/mnt/dos/"; #XXX: THIS MUST BE CORRECT TO BUILD!
#export DOS_BUILDS=$DOS_WORKSPACE_ROOT"Builds/";
export DOS_BUILDS="/mnt/backup-1/DivestOS/Builds/"; #XXX: THIS MUST BE CORRECT TO BUILD!
export DOS_BUILDS="/mnt/Storage-1/DivestOS/Builds/"; #XXX: THIS MUST BE CORRECT TO BUILD!
export DOS_SIGNING_KEYS="$DOS_WORKSPACE_ROOT/Signing_Keys/4096pro";
export DOS_SIGNING_GPG="$DOS_WORKSPACE_ROOT/Signing_Keys/gnupg";
#export USE_CCACHE=1;