diff --git a/Patches/LineageOS-14.1/cm_platform_sdk/profile_default.xml b/Patches/Common/android_lineage-sdk/profile_default.xml similarity index 100% rename from Patches/LineageOS-14.1/cm_platform_sdk/profile_default.xml rename to Patches/Common/android_lineage-sdk/profile_default.xml diff --git a/Patches/LineageOS-14.1/android_packages_apps_FDroid/default_repos.xml b/Patches/Common/android_packages_apps_FDroid/default_repos.xml similarity index 100% rename from Patches/LineageOS-14.1/android_packages_apps_FDroid/default_repos.xml rename to Patches/Common/android_packages_apps_FDroid/default_repos.xml diff --git a/Patches/LineageOS-14.1/android_vendor_cm/dns66.json b/Patches/Common/android_vendor_divested/dns66.json similarity index 100% rename from Patches/LineageOS-14.1/android_vendor_cm/dns66.json rename to Patches/Common/android_vendor_divested/dns66.json diff --git a/Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber/firmware_deblobber.sh b/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh similarity index 100% rename from Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber/firmware_deblobber.sh rename to Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh diff --git a/Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber/updater-script b/Patches/Common/android_vendor_divested/firmware_deblobber/updater-script similarity index 100% rename from Patches/LineageOS-14.1/android_vendor_cm/firmware_deblobber/updater-script rename to Patches/Common/android_vendor_divested/firmware_deblobber/updater-script diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce-microG.mk b/Patches/Common/android_vendor_divested/sce-microG.mk similarity index 100% rename from Patches/LineageOS-14.1/android_vendor_cm/sce-microG.mk rename to Patches/Common/android_vendor_divested/sce-microG.mk diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/Common/android_vendor_divested/sce.mk similarity index 100% rename from Patches/LineageOS-14.1/android_vendor_cm/sce.mk rename to Patches/Common/android_vendor_divested/sce.mk diff --git a/Patches/LineageOS-15.1/android_lineage-sdk/profile_default.xml b/Patches/LineageOS-15.1/android_lineage-sdk/profile_default.xml deleted file mode 100644 index 078519ba..00000000 --- a/Patches/LineageOS-15.1/android_lineage-sdk/profile_default.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - 1affb8e9-9f00-4a85-8126-5858d6817069 - - - toggle - no - 0 - 0 - 2 - 1 - - 0 - true - - - 154 - true - - - normal - true - - - content://settings/system/notification_sound - content://settings/system/ringtone - DEFAULT - DEFAULT - DEFAULT - DEFAULT - - - 4 - 5 - true - - - 5 - 5 - true - - - 2 - 5 - true - - - 3 - 4 - true - - - 8 - 0 - true - - - 4 - 1 - true - - - 0 - 1 - true - - - 1 - 0 - true - - - 7 - 0 - true - - - 5 - 1 - true - - - 2 - 0 - true - - - 9 - 9 - true - 1 - - - - - toggle - no - 0 - 0 - 2 - 1 - - 0 - true - - - 103 - true - - - normal - true - - - content://settings/system/notification_sound - content://settings/system/ringtone - DEFAULT - DEFAULT - DEFAULT - DEFAULT - - - 4 - 5 - true - - - 5 - 5 - true - - - 2 - 5 - true - - - 3 - 4 - true - - - 8 - 0 - true - - - 4 - 0 - true - - - 0 - 1 - true - - - 1 - 1 - true - - - 7 - 0 - true - - - 5 - 1 - true - - - 2 - 0 - true - - - 9 - 9 - true - 1 - - - - - toggle - no - 0 - 0 - 2 - 2 - - 0 - true - - - 51 - true - - - normal - true - - - content://settings/system/notification_sound - content://settings/system/ringtone - DEFAULT - DEFAULT - DEFAULT - DEFAULT - - - 4 - 5 - true - - - 5 - 5 - true - - - 3 - 4 - true - - - 2 - 5 - true - - - 8 - 0 - true - - - 4 - 0 - true - - - 1 - 1 - true - - - 0 - 1 - true - - - 7 - 0 - true - - - 5 - 0 - true - - - 2 - 0 - true - - - 9 - 9 - true - 1 - - - - - toggle - no - 0 - 0 - 0 - 0 - - 0 - true - - - 128 - true - - - normal - true - - - content://settings/system/notification_sound - content://settings/system/ringtone - DEFAULT - DEFAULT - DEFAULT - DEFAULT - - - 4 - 5 - true - - - 5 - 5 - true - - - 3 - 4 - true - - - 2 - 5 - true - - - 8 - 0 - true - - - 4 - 1 - true - - - 1 - 1 - true - - - 0 - 1 - true - - - 7 - 0 - true - - - 5 - 1 - true - - - 2 - 0 - true - - - 9 - 9 - true - 1 - - - diff --git a/Patches/LineageOS-15.1/android_packages_apps_FDroid/default_repos.xml b/Patches/LineageOS-15.1/android_packages_apps_FDroid/default_repos.xml deleted file mode 100644 index 0ea3c659..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_FDroid/default_repos.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - F-Droid - - https://f-droid.org/repo - - The official F-Droid repository. Applications in this repository are mostly built - directory from the source code. Some are official binaries built by the original - application developers - these will be replaced by source-built versions over time. - - - 18 - - 1 - - 1 - - ignore - - - 3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef - - - - F-Droid Archive - - https://f-droid.org/archive - - The archive repository of the F-Droid client. This contains older versions of - applications from the main repository. - - - 18 - - 0 - - 2 - - ignore - - - 3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef - - - - Guardian Project - - https://guardianproject.info/fdroid/repo - - The official app repository of The Guardian Project. Applications in this repository - are official binaries build by the original application developers and signed by the - same key as the APKs that are released in the Google Play store. - - - 18 - - 0 - - 3 - - ignore - - - 308205d8308203c0020900a397b4da7ecda034300d06092a864886f70d01010505003081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f301e170d3134303632363139333931385a170d3431313131303139333931385a3081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f30820222300d06092a864886f70d01010105000382020f003082020a0282020100b3cd79121b9b883843be3c4482e320809106b0a23755f1dd3c7f46f7d315d7bb2e943486d61fc7c811b9294dcc6b5baac4340f8db2b0d5e14749e7f35e1fc211fdbc1071b38b4753db201c314811bef885bd8921ad86facd6cc3b8f74d30a0b6e2e6e576f906e9581ef23d9c03e926e06d1f033f28bd1e21cfa6a0e3ff5c9d8246cf108d82b488b9fdd55d7de7ebb6a7f64b19e0d6b2ab1380a6f9d42361770d1956701a7f80e2de568acd0bb4527324b1e0973e89595d91c8cc102d9248525ae092e2c9b69f7414f724195b81427f28b1d3d09a51acfe354387915fd9521e8c890c125fc41a12bf34d2a1b304067ab7251e0e9ef41833ce109e76963b0b256395b16b886bca21b831f1408f836146019e7908829e716e72b81006610a2af08301de5d067c9e114a1e5759db8a6be6a3cc2806bcfe6fafd41b5bc9ddddb3dc33d6f605b1ca7d8a9e0ecdd6390d38906649e68a90a717bea80fa220170eea0c86fc78a7e10dac7b74b8e62045a3ecca54e035281fdc9fe5920a855fde3c0be522e3aef0c087524f13d973dff3768158b01a5800a060c06b451ec98d627dd052eda804d0556f60dbc490d94e6e9dea62ffcafb5beffbd9fc38fb2f0d7050004fe56b4dda0a27bc47554e1e0a7d764e17622e71f83a475db286bc7862deee1327e2028955d978272ea76bf0b88e70a18621aba59ff0c5993ef5f0e5d6b6b98e68b70203010001300d06092a864886f70d0101050500038202010079c79c8ef408a20d243d8bd8249fb9a48350dc19663b5e0fce67a8dbcb7de296c5ae7bbf72e98a2020fb78f2db29b54b0e24b181aa1c1d333cc0303685d6120b03216a913f96b96eb838f9bff125306ae3120af838c9fc07ebb5100125436bd24ec6d994d0bff5d065221871f8410daf536766757239bf594e61c5432c9817281b985263bada8381292e543a49814061ae11c92a316e7dc100327b59e3da90302c5ada68c6a50201bda1fcce800b53f381059665dbabeeb0b50eb22b2d7d2d9b0aa7488ca70e67ac6c518adb8e78454a466501e89d81a45bf1ebc350896f2c3ae4b6679ecfbf9d32960d4f5b493125c7876ef36158562371193f600bc511000a67bdb7c664d018f99d9e589868d103d7e0994f166b2ba18ff7e67d8c4da749e44dfae1d930ae5397083a51675c409049dfb626a96246c0015ca696e94ebb767a20147834bf78b07fece3f0872b057c1c519ff882501995237d8206b0b3832f78753ebd8dcbd1d3d9f5ba733538113af6b407d960ec4353c50eb38ab29888238da843cd404ed8f4952f59e4bbc0035fc77a54846a9d419179c46af1b4a3b7fc98e4d312aaa29b9b7d79e739703dc0fa41c7280d5587709277ffa11c3620f5fba985b82c238ba19b17ebd027af9424be0941719919f620dd3bb3c3f11638363708aa11f858e153cf3a69bce69978b90e4a273836100aa1e617ba455cd00426847f - - - - Guardian Project Archive - - https://guardianproject.info/fdroid/archive - - The official repository of The Guardian Project apps for use with F-Droid client. This - contains older versions of applications from the main repository. - - - 18 - - 0 - - 4 - - ignore - - - 308205d8308203c0020900a397b4da7ecda034300d06092a864886f70d01010505003081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f301e170d3134303632363139333931385a170d3431313131303139333931385a3081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f30820222300d06092a864886f70d01010105000382020f003082020a0282020100b3cd79121b9b883843be3c4482e320809106b0a23755f1dd3c7f46f7d315d7bb2e943486d61fc7c811b9294dcc6b5baac4340f8db2b0d5e14749e7f35e1fc211fdbc1071b38b4753db201c314811bef885bd8921ad86facd6cc3b8f74d30a0b6e2e6e576f906e9581ef23d9c03e926e06d1f033f28bd1e21cfa6a0e3ff5c9d8246cf108d82b488b9fdd55d7de7ebb6a7f64b19e0d6b2ab1380a6f9d42361770d1956701a7f80e2de568acd0bb4527324b1e0973e89595d91c8cc102d9248525ae092e2c9b69f7414f724195b81427f28b1d3d09a51acfe354387915fd9521e8c890c125fc41a12bf34d2a1b304067ab7251e0e9ef41833ce109e76963b0b256395b16b886bca21b831f1408f836146019e7908829e716e72b81006610a2af08301de5d067c9e114a1e5759db8a6be6a3cc2806bcfe6fafd41b5bc9ddddb3dc33d6f605b1ca7d8a9e0ecdd6390d38906649e68a90a717bea80fa220170eea0c86fc78a7e10dac7b74b8e62045a3ecca54e035281fdc9fe5920a855fde3c0be522e3aef0c087524f13d973dff3768158b01a5800a060c06b451ec98d627dd052eda804d0556f60dbc490d94e6e9dea62ffcafb5beffbd9fc38fb2f0d7050004fe56b4dda0a27bc47554e1e0a7d764e17622e71f83a475db286bc7862deee1327e2028955d978272ea76bf0b88e70a18621aba59ff0c5993ef5f0e5d6b6b98e68b70203010001300d06092a864886f70d0101050500038202010079c79c8ef408a20d243d8bd8249fb9a48350dc19663b5e0fce67a8dbcb7de296c5ae7bbf72e98a2020fb78f2db29b54b0e24b181aa1c1d333cc0303685d6120b03216a913f96b96eb838f9bff125306ae3120af838c9fc07ebb5100125436bd24ec6d994d0bff5d065221871f8410daf536766757239bf594e61c5432c9817281b985263bada8381292e543a49814061ae11c92a316e7dc100327b59e3da90302c5ada68c6a50201bda1fcce800b53f381059665dbabeeb0b50eb22b2d7d2d9b0aa7488ca70e67ac6c518adb8e78454a466501e89d81a45bf1ebc350896f2c3ae4b6679ecfbf9d32960d4f5b493125c7876ef36158562371193f600bc511000a67bdb7c664d018f99d9e589868d103d7e0994f166b2ba18ff7e67d8c4da749e44dfae1d930ae5397083a51675c409049dfb626a96246c0015ca696e94ebb767a20147834bf78b07fece3f0872b057c1c519ff882501995237d8206b0b3832f78753ebd8dcbd1d3d9f5ba733538113af6b407d960ec4353c50eb38ab29888238da843cd404ed8f4952f59e4bbc0035fc77a54846a9d419179c46af1b4a3b7fc98e4d312aaa29b9b7d79e739703dc0fa41c7280d5587709277ffa11c3620f5fba985b82c238ba19b17ebd027af9424be0941719919f620dd3bb3c3f11638363708aa11f858e153cf3a69bce69978b90e4a273836100aa1e617ba455cd00426847f - - - - DivestOS Official - - https://divestos.xyz/fdroid/official - - This repository contains apps created by Divested Computing, Inc. - - - 18 - - 1 - - 5 - - ignore - - - 308204f1308202d9a003020102020433292e76300d06092a864886f70d01010b050030293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a301e170d3137313130343035313033315a170d3435303332323035313033315a30293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a30820222300d06092a864886f70d01010105000382020f003082020a02820201009870537e4bc478299092496899371d21817ebf7ca2b745153e798812874d1a034f573809e4c88393cf3771c333819fa35929d9467829f482d09179c8378c5adab2c671d68112899df77295bd0f0937b21f0433359e563f1066cc4d9788e4acf70b5e17b6b022b0037f451e1fb614b0bad56683ef0a6765496029104d23856228ecc8865948d72377515e904fb41ca1a93547c5828852241bba558653684ebba1fb07fcdb7adebc8b87c9a9e9f0845f79c2d29436df08870be4f38743739ac07fa8b9e9b226b09e96b0ac3e4088a5acd1e8a92da7d557f7a48e8b43e87a56c1c670bb74fada55ada4f28ae1e8a4505ece3dba9fde03736346c30e0bf5c47a7e315df627949edf414df6ce9bedd63b96f8442e749043a1d8d710a2703764c82a814ec7e935074a0af60e18b180491b9fe961713c409e3d06a7f9c8460d6d2d94e7d7d97fd18104b7d8aad46846cb0e30d42d76aa6cfd44fde97a15d653423236a4d18af2294e82dc00bb157d3c31c0bc66069f74eaa4c846fc957940319256b8da29b6ac301fbec66b37040f362e35ca47bc8cad6a1dbe2ee8734060f3591f88af1bdcb7ce1fe64f6844e12c453619ac473102d683f3d64699c141ebd55b116ffde36e9c500de1861191ef8fecba9d5c37daccf2a31a9b0e9bc8df648a034263660338e7079ca0086c5dd8e3deccd53a30fdfacd27bc32048f7056c9f5ef3a83850203010001a321301f301d0603551d0e04160414b9274907964ebcacf534aaa2a8f9def8aa3f62f3300d06092a864886f70d01010b05000382020100139342695604ab1cbe49db9833999b2a4d9b6f2251ffaa4cc63e46664bb550170fa4cbee7fe63f69d59c88b868197b5b7ad880da071d16c3b9be9f5a492cad4dd847b8397ec79a78379fdf77f75ddf990ac61882772884baa78f5facabdd76c48ba379fc6998ff6d04f368d57ac21e258f64a198fbbea00194ed060007598c95d477cce4eb2432efb4396cd8e98b7766f7aad8919492119cb7ffcf9e613043fe5f4bb836c3a850f991371a6145dc2c2cb6b16bf7e70f7db9333cddac2430668e29e9e4f98b637fcc1761c54ea7c38c1e9af1550e3566661f45dc9d71fcbac77bf7346e9002fbc7c737bd147a2af31815fe0351e765cde22b9473b0db4f710a6cd769f1ac4b334cdb15d78beb3683b9488fe3b17c905f36fc2c5d5a1ff8d26dad74df0223d2ca489a286bbb7519d6b6aa514df7f7650475b77352da6ad05d6c7ffb3e2b8aab6a807dbd9235a87305f192e5aaa2e51fe39226f6a4e49355cc75e8cbdb919ffbcdc8c604d68a0043ac13d6f2471487ba8046c07893fcb32a32114ab0a369d1d0afca215e25f5e5de5c9a01608bbd287543210ca9bc7aaca7bb3ad2604cdd5b55aeb52d66dd63e02f4a8b2a1870744e411642d0e7964bf67509dbcd2ae096d94dede5fea99e494cf804c98fc76e4887136b57e4431ac41138b4030f443e1614cfec6d80e4fe58de93e43b15a1a0f385e4d9b714c4f3e9bba5391c75 - - - - DivestOS Unofficial - - https://divestos.xyz/fdroid/unofficial - - This repository contains unofficial builds of open source apps that are not included in the official F-Droid repo or IzzySoft repo. - - - 18 - - 0 - - 6 - - ignore - - - 308204f1308202d9a00302010202045423ae35300d06092a864886f70d01010b050030293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a301e170d3137313130343035323531385a170d3435303332323035323531385a30293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a30820222300d06092a864886f70d01010105000382020f003082020a02820201009dfa645e5bb572bfe496416a4affe8f934aa49ec0fcdfc7f562c1c3359ec4c9119c3fb49909dd0e65de6165a893d0317d9deeb7d605808bf793477dc36096ece24bdfd03217767ca96ada5706452bbe31aa0eb2576fb7088ffb6707f4af414c702c5e7418bb80bcc12c2a549e9bb24bf65f2b62126acf65110fc3c6b6c8888d12c7b62d4c2c530ecffbcebd8337a3701f84db9c1090f90b09739ac9a5d17ac24c8d58e0ec6a3f3a2570ac3ad6ca2075a9393e64da78ea147ad3604ba70206cf92086260e6d8d5dea9d0770035af441df7b14c7d0e01e3a866d35b75f0ac61f9d80ab8b22617ec4816942b9316c9296689acb6f3389c34a35f93cfec9af87a340dcfb7da2464f8ad7baf7e192537ac2431dd1b0ab74c734c0d510c023fe462bbd2414e565b53fe5a89b25be7163867d235023cb75db2fe5fc5794b586dc897488ae182f208cbb8ae94d10d3aeb4b9cfbdeac13ec9c39baa6dbe1877077417b4dd6b65cabd73e173d9eb09fcc65e6483244e1d572678ac7f2bb019e11640fcc024deedbaf868347956304b8365faf3319121aa86b82d0ad6494dc6ca27709fd7abee2c1afa9ad146e26a87b120eaf7ba60ee98d972ce2b6909d9f98aa6dfaf913b3048927a0f099793f26d1785c0c318abf610d47e1e50d93438f6ab081945ef3118325a49bc245f9362d57f5c73d9bb8f429cfdd9e73abdcdb150781f4a2036970203010001a321301f301d0603551d0e04160414f0f410806f6d62967fa247cfe16a10586b043b9d300d06092a864886f70d01010b0500038202010063b9a8ad30d5e4cf2291eb14c6b4b1e4ecd364d4d1a3ddfd07d14612e7cac71f0188e27c316efc1a396869ff390d2e06aa5b4dc97763dab2dcc69099528de0a75e4d0c50404e4d3db6f6e1dadc8b397ec3099dee482dc6884ca74527389add861d5c54c20177e313f3a305638225be4aa9ca6e9d79230b49b34e1871e0f0626d7164ec5be1c85679f641a0c12a8bf3d0bd88d16432993340ca642051757ed2c47fd62931974838f28f923faa4a65bb7a44b3f3f3d913e1f6c23397ec99d0b344119a61ec300e04ad99aed5030f660a236695ca9ba7ee58ff3440fa968813b123d03d8bc056d5a635c4f2ba16a4df12f5bc0bbab5996961f8d8173e53138c5be7413eba7a8b6f2efb9c3c58a5c6da81629c3f7b143f97f72afb739e04c48bcb10cdbcde6b96d2f4e238022dc55111b7b46a2db9893de76fe86fe914b4deda57e7dc5bf20d2f870bf689aeb0c9f6dac00214da4cbd287098cca83467ca9b4ad8d54f0dc7ecbb79162d558e14825c3b7f0bf71d45df27dbba8fc922fd2d6cb05ab7b284c0e39f6c3aa1f66eff0ce675801f6eb42d5acb65f37f72fb01fcda6e4b5f1ef6289fa51b77deeab7041fe1b85bdc13135d7562a44110b9d56439abb8f7968105ce1afe6cdcb5c2a25b4831302ba1d6abc62aefc2318422710e0fc514121a2545b35d89b3999f2c456df037e34eebd8ff223e2118da3653120068ade17d3b - - - - DivestOS Provisioner - - https://divestos.xyz/fdroid/provisioner - - This is an empty repo used to provision a device using the push install feature. Consider disabling after first use. - - - 18 - - 0 - - 7 - - prompt - - - 308204f1308202d9a003020102020451e5840f300d06092a864886f70d01010b050030293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a301e170d3138303631373232343731365a170d3435313130323232343731365a30293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a30820222300d06092a864886f70d01010105000382020f003082020a0282020100bfcffa71432b068cea0673424251dd3f418f8a98cabd4ffac34ff96e60c2d258acc6b884d61ffd05a5d546761540551cf5b389bc763bbc9185e8051ed16149e9f8c0a649ce58d459184050c53e56baa7db815a58d7f86e32d687ceb67e3f0c4926024f562b59629cd3c70e0a8ff29a00a7cfb52fc9a16210ac380065637b201414c0c57438d4d51e0d484802796187911d9d5ee05ccd499968c9b469b2499ab5d0222dc4a67eb7fd5d4a875e76affea1610df4a2393c4d1987a0a9e1eca3f763b680d9fe8616303d82438f6d0a78c3f04af8ed25232e4b61ef3d46845b3680378e6977390a247278f2b53309c15c6ca588464efe380847e5de7a96251a5fb3968706f360cea2d7cd547d439706c2c557cce85858b30c4c967984debeaf6dcedcf1a61763bf56d49f6c141b5e209fc59980fb06cd391fb4dcde0956e175c980f9be97c97a97bca04436a122b07cb3adf15c214da9bb90e39736c8f2b53c5a46119aadfa679025c2b7e5df283743ddfcf71d78a703f10739a5f24df651430500af31816f8bbc867fce82d58dd9f229e51413c7e6f49e6aef7ad9bffa79a4b9fcedf2072847a4b7f17d1504448ae31e5994d9d4cbf98a3932eff8df127dca82eaa565609c8e217c87c0d17859a1d1cb3c65a47ae4a6682f6082041ae3afe879fc18c344df61a480c0d89e0b1fb2b7e7720cbc8e076a478747caded95b72cddbcbdd0203010001a321301f301d0603551d0e04160414a26c9ea5bb0d0556d4f7e7a5de592604f7cebb36300d06092a864886f70d01010b050003820201006d924266aebf0055127a21d104ce3078f2c785bea5c8013ee98449756a0e26940b1bbeba34eaf4408a10fb13f9ca47633fca26c993f0c699f4f4e3d64cb9bf6bb00177d8fafcbfc6ba76d532a1ccf82b7d9afee9dafd96a5f4c1e2a3e1f11827042b4b38729a39f01a9ff4195f3a444bd9b61b6d51650ae553c8db2611d165be1d9fa9a2d7bac87f9387425dd0f493b1d3efc71a6d8bf83d0685a0c71f6c943348636c458f14ea5d87fbbf1be065f333d81de6c0ac54502db7ee1484a0794a8b49fd45a149824414c71c6e72b04ff7b18a2d71b0f1fb085dbf9d0619b15a5f058a559510ef09834327bd3bfc4b24b9f23db0be765cac6866d0f89b347c7d2520d18e3b672960e20dcb7adc8cb673d2f76e3f8c0a5cb5a1635f1f029f9e392fa101b432eed033f814a0c7c84986f4c5a2d637b48fb5952c42f6acb3123e8c6ea14ee9b22fc831c28fd34a7fe8397392a8c1ed5794a14f933a567bcb5e443692ef374afbe0b6497c3c207ed8b0265e684e6806f8e55dadc4165c4139901b82d1340aea71971238efd931756da88796316c7f77ca77f932a9b64a4c2ed34fc9915df13fc1710126a65e905ec64a558c00913b5c9d01eed68b21d482d3dc1e397da9ea7a5866e65edc9b93257a5f18059ec8539a65c3c2edc95ea12385c595cb52471bde16ac4209701d9a15ee0c2943757ba90f6989aa2f44cec0f0032db76258fb - - - - IzzyOnDroid - - https://apt.izzysoft.de/fdroid/repo - - This is a repository of apps to be used with F-Droid. Applications in this repository are official binaries built by the original application developers, taken from their resp. repositories (mostly Github). At this moment I cannot give guarantees on regular updates for all of them, though most are checked multiple times a week. - - - 17 - - 0 - - 8 - - ignore - - - 308204e1308202c9a003020102020454c60934300d06092a864886f70d01010b050030213110300e060355040b1307462d44726f6964310d300b060355040313046e65626f301e170d3136303331303230313634325a170d3433303732373230313634325a30213110300e060355040b1307462d44726f6964310d300b060355040313046e65626f30820222300d06092a864886f70d01010105000382020f003082020a0282020100ac59258ca2e9c216af14d58cb53adb13658480aed5ebc1f59bfc474f0f67c0efe9d58304d0cbda2897bd3283e7afe15512f32743ee243f4b9bba5a017806bc5c3441c905df37d00d3cf77b012af33ee4033b7e8d686277043bcb28241a3fe9f6ebfd72f305a928e300edf554ffaa139d85b5c9282aa8f1a82ff74caea2c13006dbeae8aac9ff44fa4c9122808b90c304db8b9e6ddecdbfbf5ce4ed0115cf1ba2bc6a4d6211765553df9b650db69155448aec4b0aaf59d19712aca3010a0d96eb02ed84e90c16162272af32fe909a5acde37d78fba500994f50c1ec5afa528945a7567567560a9fbafbabd68190c5c13f9a53f39a72734bd8de43c06b21a5cecf2747e6a1879352c49ee29fa092c26ca495baac69eddb614941e27b6a27fb3fb74cbdfe5822bfc266130c1f723a7ab91ed3d6c5261d31fc80ab82b7caa2727120522e65863af436a438c05039e1e099faae4d6170baa10fc9bb7bf101e2b4c9769e693eb7e4e3eebd47bfbfe0069c24a8b1ef72d8fe6549202490cff7b0f36c458b8192fe58f984839290d69639abb15fe1ef2925eb491627f2eefbd13225b925a7bbfc0fb4d95a3fb43599c172037e599639b4f86c4eabc173013776a854e146dfacf424cbae4254f9806ecd79d092f5e67a2f00c98ad64c0bfbeaff117fe4c62685e2e75e2ef507325d05f866510c20006a6c01e8e25d75bd42a0d5397b73eb0203010001a321301f301d0603551d0e0416041417f4fd41b0aa3f4fa981423a123f6f6016e3ce80300d06092a864886f70d01010b050003820201008d5d93cbb48fde9df566d75c54a8da2f29e9ae1bac2ed2436a0f165730244ac9e471b473674bc68717c34e30c29ce5ffa027fa12a7eb2f45b036db0cca79238262ba84f6ec8ffddcfe2b398c0a6aa33d117f83996b3bece96b1ea6f8066c395e5021c2b5fe1638c7ac146cda6ef2e4a836bd9c968ed76c51cc0b09caa4b1a79d5d10b3829804db992a70feb9a76535bc04631193abee9c9d7ebfb07ad464542f65744e76d92c5aeb3beb96dbb0b3d746845cbfa2b12c6da31863ea4a0d664dc5974d5b808c1be52a5e595ed181d86feeff4dc82bc8ee3c11ff807a811322931e804df1d90b5b813dd9ce81f3d8dd7d1bb2994901fe1c1004673f53c7b60cdbc2f914ce0718fbfc8e89b443091f71ecb9f169d558c3818bb1db714a47025154eb974600ca54e29933a87a4080910eee05dcc34de7048fa95b1128d8910b18b5957f2e745de00decd2434af455b24aa3e53de889e37919212a6adb3f4088baec6cc9f3e21b812593605fba0394355bd994f21ceaba861aae29244f5113d4291fdddedbef091e63885ebf318c6e12d338fa9555783643a19181c2cc935307fcee5e6dabf8dd6e19a92b29dbc529d3ef170916fb7b2d9dbf95a358ac7c0204b6e6a416b59441c49c41d6f78b1de63eb8b10c516a5952a20eb0c595cfa21530350c5adde74d815918deb870a9e7750fcb4dc50538fd591006434cbbb001cc2ae1fe11 - - - - microG - - https://microg.org/fdroid/repo - - This is a repository of microG apps to be used with F-Droid. Applications in this repository are signed official binaries built by the microG Team from the corresponding source code. - - - 17 - - 0 - - 9 - - ignore - - - 308202ed308201d5a003020102020426ffa009300d06092a864886f70d01010b05003027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a656374301e170d3132313030363132303533325a170d3337303933303132303533325a3027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a02820101009a8d2a5336b0eaaad89ce447828c7753b157459b79e3215dc962ca48f58c2cd7650df67d2dd7bda0880c682791f32b35c504e43e77b43c3e4e541f86e35a8293a54fb46e6b16af54d3a4eda458f1a7c8bc1b7479861ca7043337180e40079d9cdccb7e051ada9b6c88c9ec635541e2ebf0842521c3024c826f6fd6db6fd117c74e859d5af4db04448965ab5469b71ce719939a06ef30580f50febf96c474a7d265bb63f86a822ff7b643de6b76e966a18553c2858416cf3309dd24278374bdd82b4404ef6f7f122cec93859351fc6e5ea947e3ceb9d67374fe970e593e5cd05c905e1d24f5a5484f4aadef766e498adf64f7cf04bddd602ae8137b6eea40722d0203010001a321301f301d0603551d0e04160414110b7aa9ebc840b20399f69a431f4dba6ac42a64300d06092a864886f70d01010b0500038201010007c32ad893349cf86952fb5a49cfdc9b13f5e3c800aece77b2e7e0e9c83e34052f140f357ec7e6f4b432dc1ed542218a14835acd2df2deea7efd3fd5e8f1c34e1fb39ec6a427c6e6f4178b609b369040ac1f8844b789f3694dc640de06e44b247afed11637173f36f5886170fafd74954049858c6096308fc93c1bc4dd5685fa7a1f982a422f2a3b36baa8c9500474cf2af91c39cbec1bc898d10194d368aa5e91f1137ec115087c31962d8f76cd120d28c249cf76f4c70f5baa08c70a7234ce4123be080cee789477401965cfe537b924ef36747e8caca62dfefdd1a6288dcb1c4fd2aaa6131a7ad254e9742022cfd597d2ca5c660ce9e41ff537e5a4041e37 - - - - Briar Project - - https://briarproject.org/fdroid/repo - - This is a repository of apps to be used with FDroid. Applications in this repository are official binaries built by the original application developers. - - - 17 - - 0 - - 10 - - ignore - - - 308202d5308201bda0030201020204018cf0a4300d06092a864886f70d01010b0500301b31193017060355040a1310627269617270726f6a6563742e6f7267301e170d3137303732353134303630325a170d3232303732343134303630325a301b31193017060355040a1310627269617270726f6a6563742e6f726730820122300d06092a864886f70d01010105000382010f003082010a0282010100912fbe5333e85dc38a1ac8eca5d10e7e084459b3ef3ea84e72ad67758b63add64345ab2a26fef0a5be41c68461a69d1ae9f8652a98c181765f551776d3bfbcd2cfd6bb1222140566afd1cae791714ef56d6d137191d971404bdf9d93935adb0222de2df8718a6c5584dde5607da1249509fb5ed3cf2d14a0ff2962e942d1985ad3d1cd479c149caf71c98b54647d2953fbf60019df588c649598616e12c7ef7cd58cbea2ec42e067923b79be33ae4079736e521f9b4df5c1f670fbd2b55f1e4c86fb46f47a98e11f49007c8c0a390f36d8d363edf305d81be5b04d082f8c0b3a756cbc19a0ae51e3f241560457827638d8af97ac66fcb1e274d3575af17932bd0203010001a321301f301d0603551d0e04160414d16614bba270ddbbe7dfd75da361bd4e24dc3413300d06092a864886f70d01010b05000382010100573c98ccf56d9ec6644705995db1d03806c087d4be4b25061d1ce144a72e2c14c86845e6847cede6bd0c469ce610153c0c144412c8ab0171342e40acd8562c8de8032e4eb9fc6803cad0e2fd6b4da3cf0ce4148376b0b7d57bb74f1b7c55954eb184a1392fae2231aabf9705a9eace7795c99b1cd7b2e796ffc58b422e1e80b9cdec20ce352e10974c64270856e1aecf9febb8199239625692bbebc0236ecaf03f57ed70cc13057a33cbf2bd7ffa46704f530b0acbc8a0a2a05cc322704e340123aa4277e11946b35ae8c9174b9fac97e0c1207c6194856016202c94f1678a6f9911073bd46e513692274592a989d16181e02b423e89050b2704c7575b5d31f1 - - - - - diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json b/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json deleted file mode 100755 index 48efa04c..00000000 --- a/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "autoStart": true, - "dnsServers": { - "enabled": false, - "items": [ - { - "location": "1.0.0.1", - "state": 1, - "title": "Cloudflare" - }, - { - "location": "2606:4700:4700::1111", - "state": 1, - "title": "Cloudflare" - }, - { - "location": "185.121.177.177", - "state": 0, - "title": "OpenNIC Anycast" - }, - { - "location": "2a05:dfc7:5::53", - "state": 0, - "title": "OpenNIC Anycast" - }, - { - "location": "84.200.79.80", - "state": 0, - "title": "DNS.WATCH" - }, - { - "location": "2001:1608:10:25::1c04:b12f", - "state": 0, - "title": "DNS.WATCH" - }, - { - "location": "8.8.8.8", - "state": 0, - "title": "Google" - }, - { - "location": "2001:4860:4860::8888", - "state": 0, - "title": "Google" - }, - { - "location": "208.67.222.222", - "state": 0, - "title": "OpenDNS" - }, - { - "location": "2620:0:ccc::2", - "state": 0, - "title": "OpenDNS" - }, - { - "location": "9.9.9.9", - "state": 0, - "title": "Quad9" - }, - { - "location": "2620:fe::fe", - "state": 0, - "title": "Quad9" - } - ] - }, - "hosts": { - "automaticRefresh": false, - "enabled": true, - "items": [ - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt", - "state": 0, - "title": "Ads - Disconnect - GPLv3" - }, - { - "location": "https://hosts-file.net/ad_servers.txt", - "state": 2, - "title": "Ads - hpHosts - Unknown" - }, - { - "location": "http://www.winhelp2002.mvps.org/hosts.txt", - "state": 2, - "title": "Ads - MVPS - CC BY-NC-SA 3.0" - }, - { - "location": "https://pgl.yoyo.org/as/serverlist.php?hostformat=html&mimetype=plaintext", - "state": 2, - "title": "Ads - Peter Lowe's - Unknown" - }, - { - "location": "http://someonewhocares.org/hosts/hosts", - "state": 2, - "title": "Ads - someonewhocares - AS-IS NC" - }, - { - "location": "https://spotco.us/blocklists/Mobile.txt", - "state": 0, - "title": "Ads - Divested Computing, Inc. - GPLv3" - }, - { - "location": "https://spotco.us/blocklists/Experimental.txt", - "state": 0, - "title": "Ads - Divested Computing, Inc. - MIT" - }, - { - "location": "https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt", - "state": 2, - "title": "Malware - Abuse.ch - AS-IS" - }, - { - "location": "https://osint.bambenekconsulting.com/feeds/c2-dommasterlist.txt", - "state": 2, - "title": "Malware - Bambenek - AS-IS" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt", - "state": 0, - "title": "Malware - Disconnect - GPLv3" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt", - "state": 0, - "title": "Malware - Disconnect - GPLv3" - }, - { - "location": "https://dshield.org/feeds/suspiciousdomains_Low.txt", - "state": 2, - "title": "Malware - DShield - CC BY-NC-SA 2.5" - }, - { - "location": "https://www.malwaredomainlist.com/hostslist/hosts.txt", - "state": 2, - "title": "Malware - Malware Domain List - Unknown" - }, - { - "location": "https://mirror.cedia.org.ec/malwaredomains/justdomains", - "state": 2, - "title": "Malware - Malware Domains - Unknown" - }, - { - "location": "https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt", - "state": 0, - "title": "Spam - Spam404 - CC BY-SA 4.0" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt", - "state": 0, - "title": "Tracking - Disconnect - GPLv3" - } - ] - }, - "ipV6Support": true, - "nightMode": false, - "showNotification": true, - "version": 1, - "watchDog": false, - "whitelist": { - "defaultMode": 2, - "items": [ - "com.android.vending" - ], - "itemsOnVpn": [], - "showSystemApps": false - } -} - diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/firmware_deblobber.sh b/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/firmware_deblobber.sh deleted file mode 100644 index 6177cc5a..00000000 --- a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/firmware_deblobber.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/sh -#Maintain "safe" parity with Deblob.sh -#Why so many lines? Why not make a fancy function? Because we'd rather not brick devices! - -deleteBlob() { - rm -f /firmware/$1; - rm -f /firmware/image/$1; -} - -deleteBlob alipay.b00 -deleteBlob alipay.b01 -deleteBlob alipay.b02 -deleteBlob alipay.b03 -deleteBlob alipay.b04 -deleteBlob alipay.b05 -deleteBlob alipay.b06 -deleteBlob alipay.mdt -echo "Removed Alibaba AliPay firmware" - -deleteBlob dxcprm.b00 -deleteBlob dxcprm.b01 -deleteBlob dxcprm.b02 -deleteBlob dxcprm.b03 -deleteBlob dxcprm.mdt -echo "Removed Discretix DRM (old) firmware" - -deleteBlob dxhdcp2.b00 -deleteBlob dxhdcp2.b01 -deleteBlob dxhdcp2.b02 -deleteBlob dxhdcp2.b03 -deleteBlob dxhdcp2.mdt -echo "Removed Discretix DRM (new) firmware" - -deleteBlob widevine.b00 -deleteBlob widevine.b01 -deleteBlob widevine.b02 -deleteBlob widevine.b03 -deleteBlob widevine.b04 -deleteBlob widevine.b05 -deleteBlob widevine.b06 -deleteBlob widevine.mdt -echo "Removed Google Widevine DRM firmware" - -deleteBlob tzwidevine.b00 -deleteBlob tzwidevine.b01 -deleteBlob tzwidevine.b02 -deleteBlob tzwidevine.b03 -deleteBlob tzwidevine.mdt -echo "Removed Google Widevine DRM (alternate 1) firmware" - -deleteBlob tzwvcpybuf.b00 -deleteBlob tzwvcpybuf.b01 -deleteBlob tzwvcpybuf.b02 -deleteBlob tzwvcpybuf.b03 -deleteBlob tzwvcpybuf.mdt -echo "Removed Google Widevine DRM (alternate 2) firmware" - -deleteBlob htc_drmprov.b00 -deleteBlob htc_drmprov.b01 -deleteBlob htc_drmprov.b02 -deleteBlob htc_drmprov.b03 -deleteBlob htc_drmprov.b04 -deleteBlob htc_drmprov.b05 -deleteBlob htc_drmprov.b06 -deleteBlob htc_drmprov.mdt -echo "Removed HTC DRM firmware" - -deleteBlob playread.b00 -deleteBlob playread.b01 -deleteBlob playread.b02 -deleteBlob playread.b03 -deleteBlob playread.mdt -echo "Removed Microsoft PlayReady DRM firmware" - -deleteBlob hdcp1.b00 -deleteBlob hdcp1.b01 -deleteBlob hdcp1.b02 -deleteBlob hdcp1.b03 -deleteBlob hdcp1.b04 -deleteBlob hdcp1.b05 -deleteBlob hdcp1.b06 -deleteBlob hdcp1.mdt -echo "Removed [Unknown 1] DRM firmware" - -deleteBlob tzhdcp.b00 -deleteBlob tzhdcp.b01 -deleteBlob tzhdcp.b02 -deleteBlob tzhdcp.b03 -deleteBlob tzhdcp.mdt -echo "Removed [Unknown 2] DRM firmware" diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/updater-script b/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/updater-script deleted file mode 100644 index f970be01..00000000 --- a/Patches/LineageOS-15.1/android_vendor_lineage/firmware_deblobber/updater-script +++ /dev/null @@ -1,20 +0,0 @@ -ui_print("DivestOS Firmware Deblobber"); -ui_print("Based off of LineageOS's AddonSU"); - -ifelse(is_mounted("/firmware"), unmount("/firmware")); - -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/platform/msm_sdcc.1/by-name/modem", "/firmware", "")); -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/bootdevice/by-name/modem", "/firmware", "")); -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/platform/soc.0/f9824900.sdhci/by-name/modem", "/firmware", "")); - -if is_mounted("/firmware") then -package_extract_file("firmware_deblobber.sh", "/tmp/firmware_deblobber.sh"); -set_metadata("/tmp/firmware_deblobber.sh", "uid", 0, "gid", 0, "mode", 0755); -run_program("/tmp/firmware_deblobber.sh"); -unmount("/firmware"); -else -abort("Could not mount /firmware"); -endif; - -ui_print("Deblobbed!"); -set_progress(1.000000); diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/sce-microG.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce-microG.mk deleted file mode 100644 index e8246664..00000000 --- a/Patches/LineageOS-15.1/android_vendor_lineage/sce-microG.mk +++ /dev/null @@ -1,10 +0,0 @@ -# microG -PRODUCT_PACKAGES += \ - GmsCore \ - GsfProxy \ - FakeStore - -# UnifiedNLP Backends -PRODUCT_PACKAGES += \ - IchnaeaNlpBackend \ - NominatimNlpBackend diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk deleted file mode 100644 index 6c4aab5f..00000000 --- a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk +++ /dev/null @@ -1,18 +0,0 @@ -# F-Droid -PRODUCT_PACKAGES += \ - F-Droid \ - F-DroidPrivilegedExtension - -# UnifiedNLP Backends (DejaVu is always included even when microG is disabled to prevent deletion of a user's database) -PRODUCT_PACKAGES += \ - DejaVuNlpBackend - -# Others -PRODUCT_PACKAGES += \ - CameraRoll \ - LocalCalendar - -# Browser -# This is a shim, it is intended that F-Droid will update on first run to the real version of Fennec DOS -PRODUCT_PACKAGES += \ - FennecDOS diff --git a/PrebuiltApps b/PrebuiltApps index fadf08a1..930231a2 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit fadf08a1b011722cd08a68178f07e265aee5c374 +Subproject commit 930231a2191f48ab4056f761b0edb4eb415c0789 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 8b02ced6..5804cbee 100755 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -246,7 +246,7 @@ deblobDevice() { if [ "$DEBLOBBER_REPLACE_TIME" = false ]; then replaceTime="false"; fi; #Disable replacement if [ -f Android.mk ]; then #Some devices store these in a dedicated firmware partition, others in /system/vendor/firmware, either way the following are just symlinks - sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware + #sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(DXHDCP2_SYMLINKS)//' Android.mk; #Remove Discretix firmware if [ "$DEBLOBBER_REMOVE_IMS" = true ]; then sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(IMS_SYMLINKS)//' Android.mk; fi; #Remove IMS firmware sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(PLAYREADY_SYMLINKS)//' Android.mk; #Remove Microsoft Playready firmware diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 01b200a2..296ddb66 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -98,7 +98,8 @@ export -f generateBootAnimationMask; generateBootAnimationShine() { color=$1; output=$2; - convert -size 1024x128 -define gradient:angle=90 gradient:"$color" \( +clone -flop \) +append "$output"; + #convert -size 1024x128 -define gradient:angle=90 plasma:"$color" \( +clone -flop \) +append "$output"; + convert -size 2048x128 plasma:"$color" "$output"; } export -f generateBootAnimationShine; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 0bca3fe4..6e305326 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -117,7 +117,7 @@ sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = fi; enterAndClear "packages/apps/FDroid"; -cp "$patches/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos +cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos sed -i 's|outputs/apk/|outputs/apk/release/|' Android.mk; sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried. @@ -194,23 +194,23 @@ if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/common.mk; awk -i inplace '!/AudioService/' config/common.mk; fi; -cp "$patches/android_vendor_cm/sce.mk" config/sce.mk; -if [ "$MICROG_INCLUDED" = true ]; then cp "$patches/android_vendor_cm/sce-microG.mk" config/sce-microG.mk; fi; +cp "$patchesCommon/android_vendor_divested/sce.mk" config/sce.mk; +if [ "$MICROG_INCLUDED" = true ]; then cp "$patchesCommon/android_vendor_divested/sce-microG.mk" config/sce-microG.mk; fi; if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/cm/config/sce-microG.mk" >> config/sce.mk; fi; cp "$patches/android_vendor_cm/config.xml" overlay/common/vendor/cmsdk/cm/res/res/values/config.xml; #Per app performance profiles -cp -r "$patches/android_vendor_cm/firmware_deblobber" .; +cp -r "$patchesCommon/android_vendor_divested/firmware_deblobber" .; cp "$patches/android_vendor_cm/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE := dos/CM_BUILDTYPE := dosNC/' config/common.mk; fi; sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence #if [ "$HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> config/sce.mk; fi; #Include DNS66 as an alternative -if [ "$HOSTS_BLOCKING" = false ]; then cp "$patches/android_vendor_cm/dns66.json" prebuilt/common/etc/dns66.json; fi; +if [ "$HOSTS_BLOCKING" = false ]; then cp "$patchesCommon/android_vendor_divested/dns66.json" prebuilt/common/etc/dns66.json; fi; if [ "$HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/cm/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config enterAndClear "vendor/cmsdk"; awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/CMAudioService/' cm/res/res/values/config.xml; fi; -cp "$patches/cm_platform_sdk/profile_default.xml" cm/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones +cp "$patchesCommon/android_lineage-sdk/profile_default.xml" cm/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java; #Per app performance profiles fix # #END OF ROM CHANGES diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 2a242be5..54fdabb3 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -107,7 +107,7 @@ awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/' enterAndClear "lineage-sdk"; awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi; -cp "$patches/android_lineage-sdk/profile_default.xml" lineage/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones +cp "$patchesCommon/android_lineage-sdk/profile_default.xml" lineage/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones if [ "$MICROG_INCLUDED" = true ]; then enterAndClear "packages/apps/FakeStore"; @@ -117,7 +117,7 @@ sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = fi; enterAndClear "packages/apps/FDroid"; -cp "$patches/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos +cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos sed -i 's|outputs/apk/|outputs/apk/release/|' Android.mk; sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried. @@ -196,16 +196,16 @@ awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys sed -i '3iinclude vendor/lineage/config/sce.mk' config/common.mk; #Include extra apps if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/common.mk; fi; -cp "$patches/android_vendor_lineage/sce.mk" config/sce.mk; -if [ "$MICROG_INCLUDED" = true ]; then cp "$patches/android_vendor_lineage/sce-microG.mk" config/sce-microG.mk; fi; +cp "$patchesCommon/android_vendor_divested/sce.mk" config/sce.mk; +if [ "$MICROG_INCLUDED" = true ]; then cp "$patchesCommon/android_vendor_divested/sce-microG.mk" config/sce-microG.mk; fi; if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/lineage/config/sce-microG.mk" >> config/sce.mk; fi; -cp -r "$patches/android_vendor_lineage/firmware_deblobber" .; +cp -r "$patchesCommon/android_vendor_divested/firmware_deblobber" .; cp "$patches/android_vendor_lineage/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/common.mk; fi; sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence #if [ "$HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> config/sce.mk; fi; #Include DNS66 as an alternative -if [ "$HOSTS_BLOCKING" = false ]; then cp "$patches/android_vendor_lineage/dns66.json" prebuilt/common/etc/dns66.json; fi; +if [ "$HOSTS_BLOCKING" = false ]; then cp "$patchesCommon/android_vendor_divested/dns66.json" prebuilt/common/etc/dns66.json; fi; if [ "$HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/lineage/prebuilt/common/etc/dns66.json:system/etc/dns66/settings.json' config/common.mk; fi; #Include DNS66 default config # #END OF ROM CHANGES diff --git a/Scripts/init.sh b/Scripts/init.sh index 5ba39c4e..30deaf14 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -20,7 +20,7 @@ #START OF USER CONFIGURABLE OPTIONS export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD! -export DEBLOBBER_REMOVE_AUDIOFX=false; #Set true to remove AudioFX +export DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation export DEFAULT_DNS_PRESET="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9, Verisign @@ -36,7 +36,8 @@ export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion o export REBRAND_NAME="DivestOS"; export REBRAND_ZIP_PREFIX="divested"; export REBRAND_BOOTANIMATION_FONT="Fira-Sans-Bold"; #Options: $ convert -list font -export REBRAND_BOOTANIMATION_COLOR="#FF5722-#FFAB91"; +#export REBRAND_BOOTANIMATION_COLOR="#FF5722-#FF8A65"; #gradient +export REBRAND_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma export REBRAND_LEGAL="https://divestos.xyz/index.php?page=privacy_policy"; #END OF USER CONFIGURABLE OPTIONS @@ -55,6 +56,7 @@ if [ ! -d "$base" ]; then fi; export prebuiltApps=$androidWorkspace"PrebuiltApps/"; +export patchesCommon=$androidWorkspace"Patches/Common/"; export patches=$androidWorkspace"Patches/$BUILD_WORKING_DIR/"; export cvePatchesLinux=$androidWorkspace"Patches/Linux/"; export cvePatchesAndroid=$androidWorkspace"Patches/Android/";