Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-25 22:22:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various dependency updates

Browse Source 
- 14.1: update ffmpeg to @syphyr's latest
- 19.1: update SecureCamera to the latest
- 20.0: switch to latest hardened_malloc revision
- 14.1 through 19.1: pin vendor revisions

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-05-06 12:19:21 -04:00
parent 8ce5a0e671
commit c26af5a755
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
15 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Logs/resetWorkspace-LineageOS-20.0.txt
View File

@ -293,7 +293,7 @@ external/guava 74de8e915a2763cbf6a4ef36cb0d40fa0c1f5600
external/guice 3e78e30b61c9f2c0338e41ac15c1ac69d370d197
external/gwp_asan 8d9aa99c490ec0c6b60f9c7a28b04ed6d23e392c
external/hamcrest f4787df52bc932ceb8421856868da793afa4bd51
external/hardened_malloc d3152b8e8ff5070f69e7c991d34f32a429e6a894
external/hardened_malloc 749640c274d54e084505a24fa758bcb5f96a25ef
external/harfbuzz_ng 96a0723ab55cbd241d364e3e333d212f40b3164c
external/hyphenation-patterns 756bcc4ca799288f180c70de82546175a3f395ea
external/icing 1a80847b72a44761a7e2782871a3bc18f6b3f76b

2
Manifests/Manifest_LAOS-14.1.xml
View File

@ -81,7 +81,7 @@
<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="d78de94d18756b74b97509e581097014efbbbca8" />
<project path="external/ffmpeg" name="syphyr/android_external_ffmpeg" remote="github" revision="61190001372364379b095b4cd1de6787213def0e" />
<remove-project name="LineageOS/android_external_flac" />
<project path="external/flac" name="syphyr/android_external_flac" remote="github" revision="3c73deb884acf79764a769cac47a12d214929fa5" />
<!-- END OF ADDITIONAL REPOS -->

12
Manifests/Manifest_LAOS-15.1.xml
View File

@ -127,11 +127,11 @@
<!-- END OF DEVICE REPOS -->
<!-- Proprietary Blobs -->
<project path="vendor/asus" name="[COLOUR IN THE LINES]/proprietary_vendor_asus" remote="github" />
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" />
<project path="vendor/htc" name="[COLOUR IN THE LINES]/proprietary_vendor_htc" remote="github" />
<project path="vendor/huawei" name="[COLOUR IN THE LINES]/proprietary_vendor_huawei" remote="github" />
<project path="vendor/lge" name="[COLOUR IN THE LINES]/proprietary_vendor_lge" remote="github" />
<project path="vendor/zte" name="[COLOUR IN THE LINES]/proprietary_vendor_zte" remote="github" />
<project path="vendor/asus" name="[COLOUR IN THE LINES]/proprietary_vendor_asus" remote="github" revision="22555fc35b7c90651056091e04e0717de2e78364" />
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" revision="23d0abe7cfe6cf1a6650c9a58ee2dd1188e6c86f" />
<project path="vendor/htc" name="[COLOUR IN THE LINES]/proprietary_vendor_htc" remote="github" revision="9651fb0945fcf332544d9a64e2cd5d9d52d949ec" />
<project path="vendor/huawei" name="[COLOUR IN THE LINES]/proprietary_vendor_huawei" remote="github" revision="5163da2ad42406b95d00adcf6c2f11eac9e756d9" />
<project path="vendor/lge" name="[COLOUR IN THE LINES]/proprietary_vendor_lge" remote="github" revision="dcd7e295e5337da76a24bb594ae82fec626baa23" />
<project path="vendor/zte" name="[COLOUR IN THE LINES]/proprietary_vendor_zte" remote="github" revision="d04996fc8bcd4e6ae409d1d30c5763a0b6ff818e" />
</manifest>

8
Manifests/Manifest_LAOS-16.0.xml
View File

@ -119,9 +119,9 @@
<!-- END OF DEVICE REPOS -->
<!-- Proprietary Blobs -->
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" 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" />
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" revision="d967c19cec8dcdd50dff88376c959bcec422f46d" />
<project path="vendor/samsung" name="[COLOUR IN THE LINES]/proprietary_vendor_samsung" remote="github" revision="cfacdb92a7409c9e14de66171c13fd59703282e7" />
<project path="vendor/wileyfox" name="[COLOUR IN THE LINES]/proprietary_vendor_wileyfox" remote="github" revision="81fc88dff4b5928d8f4e32719506feb77269967f" />
<project path="vendor/zuk" name="[COLOUR IN THE LINES]/proprietary_vendor_zuk" remote="github" revision="e165298f3f4f32330267002ca0d23f3936db98e8" />
</manifest>

12
Manifests/Manifest_LAOS-17.1.xml
View File

@ -124,11 +124,11 @@
<project path="kernel/yandex/sdm660" name="LineageOS/android_kernel_yandex_sdm660" remote="github" />
<!-- Proprietary Blobs -->
<project path="vendor/motorola" name="[COLOUR IN THE LINES]/proprietary_vendor_motorola" remote="github" />
<project path="vendor/oneplus" name="[COLOUR IN THE LINES]/proprietary_vendor_oneplus" remote="github" />
<project path="vendor/oppo" name="[COLOUR IN THE LINES]/proprietary_vendor_oppo" remote="github" />
<project path="vendor/wileyfox" name="[COLOUR IN THE LINES]/proprietary_vendor_wileyfox" remote="github" />
<project path="vendor/xiaomi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi" remote="gitlab" revision="lineage-17.1" />
<project path="vendor/yandex" name="[COLOUR IN THE LINES]/proprietary_vendor_yandex" remote="github" />
<project path="vendor/motorola" name="[COLOUR IN THE LINES]/proprietary_vendor_motorola" remote="github" revision="e7d7ee73da86b24f2cf626fc7438491bb7dc15b2" />
<project path="vendor/oneplus" name="[COLOUR IN THE LINES]/proprietary_vendor_oneplus" remote="github" revision="f19e3fc6b75b2ba89d77403728d984c0e94b1ff9" />
<project path="vendor/oppo" name="[COLOUR IN THE LINES]/proprietary_vendor_oppo" remote="github" revision="9c7be5d86856f1db4166b5f09186ea7e8ed88353" />
<project path="vendor/wileyfox" name="[COLOUR IN THE LINES]/proprietary_vendor_wileyfox" remote="github" revision="a3c5f89887e7ffcc32a0a22236e2b28cec43912c" />
<project path="vendor/xiaomi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi" remote="gitlab" revision="ecef8f245d6f88347213efa47770d1625f7f2551" />
<project path="vendor/yandex" name="[COLOUR IN THE LINES]/proprietary_vendor_yandex" remote="github" revision="aa45292dcc0c04f43ee4bf415168ed5acf298ace" />
</manifest>

24
Manifests/Manifest_LAOS-18.1.xml
View File

@ -222,17 +222,17 @@
<project path="device/xiaomi/whyred" name="LineageOS/android_device_xiaomi_whyred" remote="github" />
<!-- Proprietary Blobs -->
<project path="vendor/asus" name="[COLOUR IN THE LINES]/proprietary_vendor_asus" remote="github" />
<project path="vendor/fairphone" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone" remote="github" />
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" />
<project path="vendor/htc" name="[COLOUR IN THE LINES]/proprietary_vendor_htc" remote="github" />
<project path="vendor/lge" name="[COLOUR IN THE LINES]/proprietary_vendor_lge" remote="github" />
<project path="vendor/motorola" name="[COLOUR IN THE LINES]/proprietary_vendor_motorola" remote="github" />
<project path="vendor/nextbit" name="[COLOUR IN THE LINES]/proprietary_vendor_nextbit" remote="github" />
<project path="vendor/oneplus" name="[COLOUR IN THE LINES]/proprietary_vendor_oneplus" remote="github" />
<project path="vendor/oppo" name="[COLOUR IN THE LINES]/proprietary_vendor_oppo" remote="github" />
<project path="vendor/samsung" name="[COLOUR IN THE LINES]/proprietary_vendor_samsung" remote="github" />
<project path="vendor/sony" name="[COLOUR IN THE LINES]/proprietary_vendor_sony" remote="github" />
<project path="vendor/xiaomi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi" remote="gitlab" revision="lineage-18.1" />
<project path="vendor/asus" name="[COLOUR IN THE LINES]/proprietary_vendor_asus" remote="github" revision="4bc21a63da51641a1c088a3dd58abc5cb0da811c" />
<project path="vendor/fairphone" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone" remote="github" revision="d38d3f0ed30cafd5a8e747ce9d5428a61e9382a2" />
<project path="vendor/google" name="[COLOUR IN THE LINES]/proprietary_vendor_google" remote="github" revision="032e2c8463fe15568c6c3e58be26f4fe19ee42ce" />
<project path="vendor/htc" name="[COLOUR IN THE LINES]/proprietary_vendor_htc" remote="github" revision="59a04d6b0de45e380ee226c763983efd6be49ade" />
<project path="vendor/lge" name="[COLOUR IN THE LINES]/proprietary_vendor_lge" remote="github" revision="baa802f19cd08e781937d048a259d030bca196c4" />
<project path="vendor/motorola" name="[COLOUR IN THE LINES]/proprietary_vendor_motorola" remote="github" revision="50a2e9ba4a6fb2888ca0a2c40cc97f6f5665c350" />
<project path="vendor/nextbit" name="[COLOUR IN THE LINES]/proprietary_vendor_nextbit" remote="github" revision="33086e3e9803bbcedce33f0fa3c40a24d7ec8bd1" />
<project path="vendor/oneplus" name="[COLOUR IN THE LINES]/proprietary_vendor_oneplus" remote="github" revision="f04ec90af2b626594d46d653b9fcd3c433e08258" />
<project path="vendor/oppo" name="[COLOUR IN THE LINES]/proprietary_vendor_oppo" remote="github" revision="dd9a32d6eff750c292fdddc0a3cfba272b7fbf9c" />
<project path="vendor/samsung" name="[COLOUR IN THE LINES]/proprietary_vendor_samsung" remote="github" revision="9508b39c6123853f50ceb15436818fc547b62034" />
<project path="vendor/sony" name="[COLOUR IN THE LINES]/proprietary_vendor_sony" remote="github" revision="d0e286bd6570044e805c952f5fe034fd77aa4f8d" />
<project path="vendor/xiaomi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi" remote="gitlab" revision="5ef13fcc9aad481069a58e5a1dc945ee0c31f270" />
</manifest>

4
Manifests/Manifest_LAOS-19.1.xml
View File

@ -50,7 +50,7 @@
<!-- START OF ADDITIONAL REPOS -->
<!-- GrapheneOS -->
<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="0d6d63cbe7cb6326bb06e1161b680cb3229f25a0" />
<project path="external/SecureCamera" name="GrapheneOS/platform_external_Camera" remote="github" revision="488f5c27410aefae5a433cd112f8a490724943b4" />
<project path="external/SecureCamera" name="GrapheneOS/platform_external_Camera" remote="github" revision="6b16f075e691d064379fe9d855f4c5c5a44c7f55" />
<!-- END OF ADDITIONAL REPOS -->
<!-- START OF DEVICE REPOS -->
@ -70,5 +70,5 @@
<project path="kernel/xiaomi/sm8150" name="LineageOS/android_kernel_xiaomi_sm8150" remote="github" />
<!-- Proprietary Blobs -->
<project path="vendor/xiaomi" name="COLOR_IN_THE_LINES/proprietary_vendor_xiaomi" remote="gitlab" revision="lineage-19.1" />
<project path="vendor/xiaomi" name="COLOR_IN_THE_LINES/proprietary_vendor_xiaomi" remote="gitlab" revision="bb09565e99c8a61758588053149a2fc783c811e2" />
</manifest>

2
Manifests/Manifest_LAOS-20.0.xml
View File

@ -50,7 +50,7 @@
<!-- START OF ADDITIONAL REPOS -->
<!-- GrapheneOS -->
<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="8d5c63122499169df5fd9ed6e91fb116512a4745" />
<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="749640c274d54e084505a24fa758bcb5f96a25ef" />
<!-- OpenEUICC -->
<project path="packages/apps/OpenEUICC" name="PeterCxy/OpenEUICC" remote="angry" revision="6add8c89ac141f177cd8d124a0a955232f4222f9" />

2
Patches/LineageOS-20.0/android_build/0004-Selective_APEX.patch
View File

@ -10,7 +10,7 @@ Change-Id: Icffb72d8c3ed0e33e76538bb3427377c33c55ff9
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 7f5f74f4b..aa7c02cdd 100644
index 7f5f74f4b..18c1aadc2 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -21,8 +21,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)

36
Patches/LineageOS-20.0/android_external_hardened_malloc/0001-Broken_Cameras-1.patch
View File

@ -8,12 +8,12 @@ Subject: [PATCH] workarounds for Pixel 3 SoC era camera driver bugs
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/h_malloc.c b/h_malloc.c
index 91eb6ca..824119b 100644
index 15be0a2..3fa9ed7 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -76,6 +76,9 @@ static union {
#ifdef USE_PKEY
int metadata_pkey;
@@ -80,6 +80,9 @@ static union {
#ifdef MEMTAG
bool is_memtag_disabled;
#endif
+ bool zero_on_free;
+ bool purge_slabs;
@ -21,7 +21,7 @@ index 91eb6ca..824119b 100644
};
char padding[PAGE_SIZE];
} ro __attribute__((aligned(PAGE_SIZE)));
@@ -443,7 +446,7 @@ static void *slot_pointer(size_t size, void *slab, size_t slot) {
@@ -465,7 +468,7 @@ static void *slot_pointer(size_t size, void *slab, size_t slot) {
}
static void write_after_free_check(const char *p, size_t size) {
@ -30,16 +30,16 @@ index 91eb6ca..824119b 100644
return;
}
@@ -694,7 +697,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
if (likely(!is_zero_size)) {
check_canary(metadata, p, size);
@@ -812,7 +815,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
}
#endif
- if (ZERO_ON_FREE) {
+ if (ro.zero_on_free) {
- if (ZERO_ON_FREE && !skip_zero) {
+ if (ro.zero_on_free && !skip_zero) {
memset(p, 0, size - canary_size);
}
}
@@ -772,7 +775,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
@@ -890,7 +893,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
if (c->empty_slabs_total + slab_size > max_empty_slabs_total) {
int saved_errno = errno;
@ -48,7 +48,7 @@ index 91eb6ca..824119b 100644
label_slab(slab, slab_size, class);
stats_slab_deallocate(c, slab_size);
enqueue_free_slab(c, metadata);
@@ -858,7 +861,7 @@ static void regions_quarantine_deallocate_pages(void *p, size_t size, size_t gua
@@ -976,7 +979,7 @@ static void regions_quarantine_deallocate_pages(void *p, size_t size, size_t gua
return;
}
@ -57,7 +57,7 @@ index 91eb6ca..824119b 100644
memory_purge(p, size);
} else {
memory_set_name(p, size, "malloc large quarantine");
@@ -1074,6 +1077,21 @@ static inline void enforce_init(void) {
@@ -1192,6 +1195,21 @@ static inline void enforce_init(void) {
}
}
@ -76,10 +76,10 @@ index 91eb6ca..824119b 100644
+ }
+}
+
COLD static void init_slow_path(void) {
static struct mutex lock = MUTEX_INITIALIZER;
static struct mutex init_lock = MUTEX_INITIALIZER;
@@ -1088,6 +1106,11 @@ COLD static void init_slow_path(void) {
COLD static void init_slow_path(void) {
@@ -1207,6 +1225,11 @@ COLD static void init_slow_path(void) {
ro.metadata_pkey = pkey_alloc(0, 0);
#endif
@ -91,7 +91,7 @@ index 91eb6ca..824119b 100644
if (unlikely(sysconf(_SC_PAGESIZE) != PAGE_SIZE)) {
fatal_error("runtime page size does not match compile-time page size which is not supported");
}
@@ -1365,7 +1388,7 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) {
@@ -1491,7 +1514,7 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) {
}
total_size = adjust_size_for_canary(total_size);
void *p = alloc(total_size);
@ -99,4 +99,4 @@ index 91eb6ca..824119b 100644
+ if (!ro.zero_on_free && likely(p != NULL) && total_size && total_size <= max_slab_size_class) {
memset(p, 0, total_size - canary_size);
}
return p;
#ifdef HAS_ARM_MTE

4
Patches/LineageOS-20.0/android_external_hardened_malloc/0001-Broken_Cameras-2.patch
View File

@ -10,10 +10,10 @@ Change-Id: I23513ec0379bbb10829f989690334e9704fd20e2
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/h_malloc.c b/h_malloc.c
index 824119b..bc6eb16 100644
index 3fa9ed7..0308d73 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -1085,7 +1085,8 @@ COLD static void handle_bugs(void) {
@@ -1203,7 +1203,8 @@ COLD static void handle_bugs(void) {
// Pixel 3, Pixel 3 XL, Pixel 3a and Pixel 3a XL camera provider
const char camera_provider[] = "/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64";

6
Patches/LineageOS-20.0/android_external_hardened_malloc/0002-Broken_Displays.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: Tad <tad@spotco.us>
1 file changed, 9 insertions(+)
diff --git a/h_malloc.c b/h_malloc.c
index bc6eb16..7f76cad 100644
index 0308d73..6c3b148 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -1091,6 +1091,15 @@ COLD static void handle_bugs(void) {
@@ -1209,6 +1209,15 @@ COLD static void handle_bugs(void) {
ro.purge_slabs = false;
ro.region_quarantine_protect = false;
}
@ -28,4 +28,4 @@ index bc6eb16..7f76cad 100644
+ }
}
COLD static void init_slow_path(void) {
static struct mutex init_lock = MUTEX_INITIALIZER;

2
Patches/LineageOS-20.0/android_frameworks_base/0030-agnss.goog_override.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Tad <tad@spotco.us>
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java b/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
index 243910dd9541..f90c5b04abca 100644
index 243910dd9541..f111d5190340 100644
--- a/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
+++ b/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
@@ -18,6 +18,7 @@ package com.android.server.location.gnss;

2
PrebuiltApps

@ -1 +1 @@
Subproject commit 09f305c9aeb14b723ab1d2c97b2f989c1da63182
Subproject commit f59d65f6eeb20d58a65ccd4f4f353ed65d8c06d0

2
Scripts/LineageOS-20.0/Patch.sh
View File

@ -51,6 +51,7 @@ cd "$DOS_BUILD_BASE";
#top dir
cp -r "$DOS_PREBUILT_APPS/Fennec_DOS-Shim" "$DOS_BUILD_BASE/packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK
cp -r "$DOS_PREBUILT_APPS/SupportDivestOS" "$DOS_BUILD_BASE/packages/apps/"; #Add the Support app
#cp -r "$DOS_PREBUILT_APPS/OpenEUICC" "$DOS_BUILD_BASE/packages/apps/"; #Add the OpenEUICC app
gpgVerifyDirectory "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/packages";
cp -r "$DOS_PREBUILT_APPS/android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE/vendor/fdroid_prebuilt/"; #Add the prebuilt apps
cp -r "$DOS_PATCHES_COMMON/android_vendor_divested/." "$DOS_BUILD_BASE/vendor/divested/"; #Add our vendor files
@ -119,6 +120,7 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-1.
applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
sed -i -e '76,78d;' Android.bp; #fix compile under A13
fi;
fi;