Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

More branch switching, thanks to @syphyr

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-23 11:05:03 -04:00
parent 7835c2b2ae
commit 1fde0f9c45
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
11 changed files with 507 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Manifests/Manifest_LAOS-14.1.xml
View File

@ -69,13 +69,17 @@
<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_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" />
<!-- @syphyr's security backport branches -->
<remove-project name="LineageOS/android_external_boringssl" />
<project path="external/boringssl" name="syphyr/android_external_boringssl" remote="github" revision="f8397314565d6441b52f5aa313d06a98a03c31cd" />
<remove-project name="LineageOS/android_external_ffmpeg" />
<project path="external/ffmpeg" name="syphyr/android_external_ffmpeg" remote="github" revision="651981ea74e55e475d8c32470e481896cfbf0c32" />
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<!-- END OF ADDITIONAL REPOS -->
<!-- START OF DEVICE REPOS -->

6
Manifests/Manifest_LAOS-15.1.xml
View File

@ -71,9 +71,11 @@
<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" />
<!-- @syphyr's security backport branches -->
<!-- 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="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<project path="external/freetype" name="LineageOS/android_external_freetype" remote="github" revision="lineage-18.1" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

6
Manifests/Manifest_LAOS-16.0.xml
View File

@ -69,9 +69,11 @@
<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" />
<!-- @syphyr's security backport branches -->
<!-- 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="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<project path="external/freetype" name="LineageOS/android_external_freetype" remote="github" revision="lineage-18.1" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

4
Manifests/Manifest_LAOS-17.1.xml
View File

@ -65,6 +65,10 @@
<!-- 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 -->

160
Patches/LineageOS-14.1/android_external_aac/0001-makefile.patch Normal file
View File

@ -0,0 +1,160 @@
From a7a13d846ec35cbab5acbac9580679eb1878be8f 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
Change-Id: Ie0cdd00be6f73a0b39a43eb67c95a0a628a11923
---
Android.bp | 54 ------------------------------------
Android.mk | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 54 deletions(-)
delete mode 100644 Android.bp
create mode 100644 Android.mk
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 80a0347..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,54 +0,0 @@
-cc_library_static {
- name: "libFraunhoferAAC",
- vendor_available: true,
- srcs: [
- "libAACdec/src/*.cpp",
- "libAACenc/src/*.cpp",
- "libPCMutils/src/*.cpp",
- "libFDK/src/*.cpp",
- "libSYS/src/*.cpp",
- "libMpegTPDec/src/*.cpp",
- "libMpegTPEnc/src/*.cpp",
- "libSBRdec/src/*.cpp",
- "libSBRenc/src/*.cpp",
- "libArithCoding/src/*.cpp",
- "libDRCdec/src/*.cpp",
- "libSACdec/src/*.cpp",
- "libSACenc/src/*.cpp",
- ],
- cflags: [
- "-Werror",
- "-Wno-unused-parameter",
- "-Wno-#warnings",
- "-Wuninitialized",
- "-Wno-self-assign",
- "-Wno-implicit-fallthrough",
- ],
- sanitize: {
- misc_undefined:[
- "unsigned-integer-overflow",
- "signed-integer-overflow",
- "bounds",
- ],
- // Enable CFI if this becomes a shared library.
- // cfi: true,
- },
- shared_libs: [
- "liblog",
- ],
- export_include_dirs: [
- "libAACdec/include",
- "libAACenc/include",
- "libPCMutils/include",
- "libFDK/include",
- "libSYS/include",
- "libMpegTPDec/include",
- "libMpegTPEnc/include",
- "libSBRdec/include",
- "libSBRenc/include",
- "libArithCoding/include",
- "libDRCdec/include",
- "libSACdec/include",
- "libSACenc/include",
- ],
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..fc89fa6
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,81 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+aacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp))
+aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
+
+aacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp))
+aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
+
+pcmutils_sources := $(sort $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp))
+pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
+
+fdk_sources := $(sort $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp))
+fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
+
+sys_sources := $(sort $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp))
+sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
+
+mpegtpdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp))
+mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
+
+mpegtpenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp))
+mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
+
+sbrdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp))
+sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
+
+sbrenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp))
+sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
+
+arithcoding_sources := $(sort $(wildcard $(LOCAL_PATH)/libArithCoding/src/*.cpp))
+arithcoding_sources := $(arithcoding_sources:$(LOCAL_PATH)/libArithCoding/src/%=%)
+
+drcdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libDRCdec/src/*.cpp))
+drcdec_sources := $(drcdec_sources:$(LOCAL_PATH)/libDRCdec/src/%=%)
+
+sacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSACdec/src/*.cpp))
+sacdec_sources := $(sacdec_sources:$(LOCAL_PATH)/libSACdec/src/%=%)
+
+sacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSACenc/src/*.cpp))
+sacenc_sources := $(sacenc_sources:$(LOCAL_PATH)/libSACenc/src/%=%)
+
+LOCAL_SRC_FILES := \
+ $(aacdec_sources:%=libAACdec/src/%) \
+ $(aacenc_sources:%=libAACenc/src/%) \
+ $(pcmutils_sources:%=libPCMutils/src/%) \
+ $(fdk_sources:%=libFDK/src/%) \
+ $(sys_sources:%=libSYS/src/%) \
+ $(mpegtpdec_sources:%=libMpegTPDec/src/%) \
+ $(mpegtpenc_sources:%=libMpegTPEnc/src/%) \
+ $(sbrdec_sources:%=libSBRdec/src/%) \
+ $(sbrenc_sources:%=libSBRenc/src/%) \
+ $(arithcoding_sources:%=libArithCoding/src/%) \
+ $(drcdec_sources:%=libDRCdec/src/%) \
+ $(sacdec_sources:%=libSACdec/src/%) \
+ $(sacenc_sources:%=libSACenc/src/%)
+
+LOCAL_CFLAGS += -Werror -Wno-unused-parameter -Wno-#warnings -Wuninitialized \
+ -Wno-self-assign -Wno-implicit-fallthrough
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/libAACdec/include \
+ $(LOCAL_PATH)/libAACenc/include \
+ $(LOCAL_PATH)/libPCMutils/include \
+ $(LOCAL_PATH)/libFDK/include \
+ $(LOCAL_PATH)/libSYS/include \
+ $(LOCAL_PATH)/libMpegTPDec/include \
+ $(LOCAL_PATH)/libMpegTPEnc/include \
+ $(LOCAL_PATH)/libSBRdec/include \
+ $(LOCAL_PATH)/libSBRenc/include \
+ $(LOCAL_PATH)/libArithCoding/include \
+ $(LOCAL_PATH)/libDRCdec/include \
+ $(LOCAL_PATH)/libSACdec/include \
+ $(LOCAL_PATH)/libSACenc/include
+
+LOCAL_SHARED_LIBRARIES := \
+ liblog
+
+LOCAL_MODULE:= libFraunhoferAAC
+
+include $(BUILD_STATIC_LIBRARY)

38
Patches/LineageOS-14.1/android_external_aac/364027.patch Normal file
View File

@ -0,0 +1,38 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>
Date: Tue, 30 May 2023 16:39:32 +0200
Subject: [PATCH] Increase patchParam array size by one and fix out-of-bounce
write in resetLppTransposer().
Bug: 279766766
Test: see POC
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:451762ca48e7fb30a0ce77a8962813a3419ec420)
Merged-In: I206973e0bb21140865efffd930e39f920f477359
Change-Id: I206973e0bb21140865efffd930e39f920f477359
---
libSBRdec/src/lpp_tran.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libSBRdec/src/lpp_tran.h b/libSBRdec/src/lpp_tran.h
index 51b4395..21c4101 100644
--- a/libSBRdec/src/lpp_tran.h
+++ b/libSBRdec/src/lpp_tran.h
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -207,7 +207,7 @@ typedef struct {
inverse filtering levels */
PATCH_PARAM
- patchParam[MAX_NUM_PATCHES]; /*!< new parameter set for patching */
+ patchParam[MAX_NUM_PATCHES + 1]; /*!< new parameter set for patching */
WHITENING_FACTORS
whFactors; /*!< the pole moving factors for certain
whitening levels as indicated in the bitstream

241
Patches/LineageOS-14.1/android_external_freetype/0001-makefile.patch Normal file
View File

@ -0,0 +1,241 @@
From 4cbccba5585d15b6763fe581e58ce953fbfd0a6a 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
Change-Id: I1b8f729e1e98f333d27c7cb1364b6c0a4133b8e9
---
Android.bp | 153 -----------------------------------------------------
Android.mk | 63 ++++++++++++++++++++++
2 files changed, 63 insertions(+), 153 deletions(-)
delete mode 100644 Android.bp
create mode 100644 Android.mk
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 8b3d01d0a..000000000
--- a/Android.bp
+++ /dev/null
@@ -1,153 +0,0 @@
-cc_library {
- name: "libft2",
- host_supported: true,
- // TODO(b/153609531): remove when no longer needed.
- native_bridge_supported: true,
-
- // compile in ARM mode, since the glyph loader/renderer is a hotspot
- // when loading complex pages in the browser
- //
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
-
- srcs: [
- "src/autofit/autofit.c",
- "src/base/ftbase.c",
- "src/base/ftbbox.c",
- "src/base/ftbitmap.c",
- "src/base/ftdebug.c",
- "src/base/ftfstype.c",
- "src/base/ftgasp.c",
- "src/base/ftglyph.c",
- "src/base/ftinit.c",
- "src/base/ftmm.c",
- "src/base/ftstroke.c",
- "src/base/fttype1.c",
- "src/base/ftsystem.c",
- "src/cid/type1cid.c",
- "src/cff/cff.c",
- "src/gzip/ftgzip.c",
- "src/psaux/psaux.c",
- "src/pshinter/pshinter.c",
- "src/psnames/psnames.c",
- "src/raster/raster.c",
- "src/sfnt/sfnt.c",
- "src/smooth/smooth.c",
- "src/truetype/truetype.c",
- "src/type1/type1.c",
- ],
-
- export_include_dirs: ["include"],
-
- cflags: [
- "-W",
- "-Wall",
- "-Werror",
-
- "-DDARWIN_NO_CARBON",
- "-DFT2_BUILD_LIBRARY",
-
- // Usually these are defined in include/freetype/config/ftoption.h
- // we have commented them and defined them here to allow for the
- // no dependency variant libft2.nodep below.
- "-DFT_CONFIG_OPTION_USE_PNG",
- "-DFT_CONFIG_OPTION_USE_ZLIB",
-
- "-O2",
-
- // Upstream ignores unused parameter warning
- "-Wno-unused-parameter",
- // Disabling some of modules results in warnings
- "-Wno-unused-variable",
- // the following is for testing only, and should not be used in final
- // builds of the product
- // "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER",
- ],
-
- shared_libs: [
- "libpng",
- "libz",
- ],
-
- target: {
- android: {
- cflags: [
- "-fPIC",
- "-DPIC",
- ],
- },
- not_windows: {
- cflags: [
- "-fPIC",
- "-DPIC",
- ],
- },
- windows: {
- enabled: true,
- },
- },
-}
-
-llndk_library {
- name: "libft2",
- vendor_available: false,
- symbol_file: "libft2.map.txt",
- export_include_dirs: ["include"],
-}
-
-// variant of libft2 without any library dependencies.
-cc_library_static {
- name: "libft2.nodep",
- host_supported: true,
-
- // compile in ARM mode, since the glyph loader/renderer is a hotspot
- // when loading complex pages in the browser
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
-
- srcs: [
- "src/autofit/autofit.c",
- "src/base/ftbase.c",
- "src/base/ftbbox.c",
- "src/base/ftbitmap.c",
- "src/base/ftdebug.c",
- "src/base/ftfstype.c",
- "src/base/ftgasp.c",
- "src/base/ftglyph.c",
- "src/base/ftinit.c",
- "src/base/ftmm.c",
- "src/base/ftstroke.c",
- "src/base/fttype1.c",
- "src/base/ftsystem.c",
- "src/cid/type1cid.c",
- "src/cff/cff.c",
- "src/gzip/ftgzip.c",
- "src/psaux/psaux.c",
- "src/pshinter/pshinter.c",
- "src/psnames/psnames.c",
- "src/raster/raster.c",
- "src/sfnt/sfnt.c",
- "src/smooth/smooth.c",
- "src/truetype/truetype.c",
- "src/type1/type1.c",
- ],
-
- export_include_dirs: ["include"],
-
- cflags: [
- "-W",
- "-Wall",
- "-Werror",
-
- "-DDARWIN_NO_CARBON",
- "-DFT2_BUILD_LIBRARY",
-
- "-O2",
- ],
-}
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 000000000..1661e506a
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,63 @@
+# this is now the default FreeType build for Android
+#
+ifndef USE_FREETYPE
+USE_FREETYPE := 2.7
+endif
+
+ifeq ($(USE_FREETYPE),2.7)
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# compile in ARM mode, since the glyph loader/renderer is a hotspot
+# when loading complex pages in the browser
+#
+LOCAL_ARM_MODE := arm
+
+LOCAL_SRC_FILES:= \
+ src/autofit/autofit.c \
+ src/base/ftbase.c \
+ src/base/ftbbox.c \
+ src/base/ftbitmap.c \
+ src/base/ftdebug.c \
+ src/base/ftfstype.c \
+ src/base/ftgasp.c \
+ src/base/ftglyph.c \
+ src/base/ftinit.c \
+ src/base/ftmm.c \
+ src/base/ftstroke.c \
+ src/base/fttype1.c \
+ src/base/ftsystem.c \
+ src/cid/type1cid.c \
+ src/cff/cff.c \
+ src/gzip/ftgzip.c \
+ src/psaux/psaux.c \
+ src/pshinter/pshinter.c \
+ src/psnames/psnames.c \
+ src/raster/raster.c \
+ src/sfnt/sfnt.c \
+ src/smooth/smooth.c \
+ src/truetype/truetype.c \
+ src/type1/type1.c
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/include \
+ external/libpng \
+ external/zlib
+
+LOCAL_CFLAGS += -W -Wall
+LOCAL_CFLAGS += -fPIC -DPIC
+LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
+LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
+
+LOCAL_SHARED_LIBRARIES += libpng libz
+
+# the following is for testing only, and should not be used in final builds
+# of the product
+#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+LOCAL_CFLAGS += -O2
+
+LOCAL_MODULE:= libft2
+
+include $(BUILD_SHARED_LIBRARY)
+endif

38
Patches/LineageOS-15.1/android_external_aac/364027.patch Normal file
View File

@ -0,0 +1,38 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>
Date: Tue, 30 May 2023 16:39:32 +0200
Subject: [PATCH] Increase patchParam array size by one and fix out-of-bounce
write in resetLppTransposer().
Bug: 279766766
Test: see POC
(cherry picked from commit f682b8787eb312b9f8997dac4c2c18bb779cf0df)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:451762ca48e7fb30a0ce77a8962813a3419ec420)
Merged-In: I206973e0bb21140865efffd930e39f920f477359
Change-Id: I206973e0bb21140865efffd930e39f920f477359
---
libSBRdec/src/lpp_tran.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libSBRdec/src/lpp_tran.h b/libSBRdec/src/lpp_tran.h
index 51b4395..21c4101 100644
--- a/libSBRdec/src/lpp_tran.h
+++ b/libSBRdec/src/lpp_tran.h
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -207,7 +207,7 @@ typedef struct {
inverse filtering levels */
PATCH_PARAM
- patchParam[MAX_NUM_PATCHES]; /*!< new parameter set for patching */
+ patchParam[MAX_NUM_PATCHES + 1]; /*!< new parameter set for patching */
WHITENING_FACTORS
whFactors; /*!< the pole moving factors for certain
whitening levels as indicated in the bitstream

9
Scripts/LineageOS-14.1/Patch.sh
View File

@ -85,7 +85,9 @@ applyPatch "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #F
fi;
if enterAndClear "external/aac"; then
applyPatch "$DOS_PATCHES/android_external_aac/364027-backport.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
#applyPatch "$DOS_PATCHES/android_external_aac/364027-backport.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
applyPatch "$DOS_PATCHES/android_external_aac/364027.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
applyPatch "$DOS_PATCHES/android_external_aac/0001-makefile.patch"; #Add Android.mk for legacy builds (syphyr)
fi;
if enterAndClear "external/apache-http"; then
@ -104,9 +106,10 @@ 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
if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360899.patch"; #n-asb-2023-07 Cherry-pick two upstream changes
#fi;
applyPatch "$DOS_PATCHES/android_external_freetype/0001-makefile.patch"; #Add Android.mk for legacy builds (syphyr)
fi;
if enterAndClear "external/libavc"; then
applyPatch "$DOS_PATCHES/android_external_libavc/315711.patch"; #n-asb-2021-09 Decoder: Update check for increment u2_cur_slice_num

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

@ -92,7 +92,8 @@ applyPatch "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #F
fi;
if enterAndClear "external/aac"; then
applyPatch "$DOS_PATCHES/android_external_aac/364027-backport.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
#applyPatch "$DOS_PATCHES/android_external_aac/364027-backport.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
applyPatch "$DOS_PATCHES/android_external_aac/364027.patch"; #R_asb_2023-08 Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer().
fi;
if enterAndClear "external/chromium-webview"; 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