Update/port patches for 128.0.6613.99.0

GrapheneOS · Aug 28, 2024 · 219f6f2 · 219f6f2
1 parent 20b479d
commit 219f6f2
Show file tree

Hide file tree

Showing 14 changed files with 1,017 additions and 55 deletions.
diff --git a/patches/0001-Vanadium-string-rebranding.patch b/patches/0001-Vanadium-string-rebranding.patch
diff --git a/patches/0012-Checkout-PGO-profiles.patch b/patches/0012-Checkout-PGO-profiles.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 24e3d54243d59..5f30d7de632e9 100644
+index 76ea649d79e24..8ce0c6fd25774 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -149,7 +149,7 @@ vars = {

diff --git a/patches/0013-disable-checkout_nacl.patch b/patches/0013-disable-checkout_nacl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 5f30d7de632e9..4505e1a6164b9 100644
+index 8ce0c6fd25774..10f8c4dea1d90 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -118,7 +118,7 @@ vars = {

diff --git a/patches/0136-config-parser-Add-config-parser-for-browser-and-webv.patch b/patches/0136-config-parser-Add-config-parser-for-browser-and-webv.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] config-parser: Add config parser for browser and webview
 
 ---
  vanadium/android_config/proto/BUILD.gn        |  10 +
- .../vanadium/config/VanadiumConfParser.java   | 534 ++++++++++++++++++
- 2 files changed, 544 insertions(+)
+ .../vanadium/config/VanadiumConfParser.java   | 537 ++++++++++++++++++
+ 2 files changed, 547 insertions(+)
  create mode 100644 vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 
 diff --git a/vanadium/android_config/proto/BUILD.gn b/vanadium/android_config/proto/BUILD.gn
@@ -29,10 +29,10 @@ index e3cf1229f8920..ae2627740c4e0 100644
 +}
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 new file mode 100644
-index 0000000000000..c056faacb11c4
+index 0000000000000..8ead72f2bd746
 --- /dev/null
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-@@ -0,0 +1,534 @@
+@@ -0,0 +1,537 @@
 +package app.vanadium.config;
 +
 +import android.content.BroadcastReceiver;
@@ -429,15 +429,18 @@ index 0000000000000..c056faacb11c4
 +            final ArrayMap<String, Set<String>> enabledSwitchFlags = new ArrayMap<>();
 +            final ArrayMap<String, Set<String>> disabledSwitchFlags = new ArrayMap<>();
 +
++            Spec defaultSpec = Spec.getDefaultInstance();
 +            for (Config config : configs.getConfigsList()) {
 +                Spec spec = config.getSpec();
 +                final long minVersionCode = spec.getMinVersion();
 +                final long maxVersionCode = spec.getMaxVersion();
 +                final long curVersionCode = selfPkgInfo.getLongVersionCode();
 +
-+                if (minVersionCode != 0 && minVersionCode > curVersionCode) {
++                if (minVersionCode != spec.getMinVersion()
++                        && minVersionCode > curVersionCode) {
 +                    continue;
-+                } else if (maxVersionCode != 0 && maxVersionCode < curVersionCode) {
++                } else if (maxVersionCode != spec.getMaxVersion()
++                        && maxVersionCode < curVersionCode) {
 +                    continue;
 +                } else if ((spec.getSpecTypes() & (1L << specType.getNumber())) == 0) {
 +                    continue;

diff --git a/patches/0138-config-add-new-needed-deps-to-fetch-filter-lists.patch b/patches/0138-config-add-new-needed-deps-to-fetch-filter-lists.patch
@@ -10,7 +10,7 @@ for adblocking.
  1 file changed, 11 insertions(+)
 
 diff --git a/DEPS b/DEPS
-index 4505e1a6164b9..129d7119d8e25 100644
+index 10f8c4dea1d90..14e6808b10ff6 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -6012,6 +6012,17 @@ hooks = [

diff --git a/patches/0142-Add-support-for-upstream-file-based-parsing-of-unind.patch b/patches/0142-Add-support-for-upstream-file-based-parsing-of-unind.patch
@@ -116,7 +116,7 @@ index 0000000000000..a42d38734d266
 +    }
 +}
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-index c056faacb11c4..c30c00e412a6a 100644
+index 8ead72f2bd746..c207eb8deb8cb 100644
 --- a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 @@ -321,6 +321,9 @@ public final class VanadiumConfParser {

diff --git a/patches/0161-config-Remove-support-for-broadcast-receiver-for-fet.patch b/patches/0161-config-Remove-support-for-broadcast-receiver-for-fet.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] config: Remove support for broadcast receiver for fetching
  1 file changed, 36 deletions(-)
 
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-index c30c00e412a6a..d71ceca93706a 100644
+index c207eb8deb8cb..c6eb68a0f76a7 100644
 --- a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 @@ -1,13 +1,9 @@

diff --git a/patches/0174-config-parser-add-support-for-parsing-conditional-co.patch b/patches/0174-config-parser-add-support-for-parsing-conditional-co.patch
@@ -54,7 +54,7 @@ index ec1be4d92d378..39d8de8b26056 100644
          VanadiumConfConditionals.conditionSupplier = conditionSupplier;
      }
 diff --git a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
-index d71ceca93706a..76fcd33f74909 100644
+index c6eb68a0f76a7..07ea37365ceb8 100644
 --- a/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 +++ b/vanadium/android_config/proto/java/src/app/vanadium/config/VanadiumConfParser.java
 @@ -26,7 +26,9 @@ import java.util.zip.ZipEntry;

diff --git a/patches/0179-add-support-for-german-specific-langauge-content-fil.patch b/patches/0179-add-support-for-german-specific-langauge-content-fil.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] add support for german-specific langauge content filtering
  4 files changed, 26 insertions(+)
 
 diff --git a/DEPS b/DEPS
-index 129d7119d8e25..86cb795d00fca 100644
+index 14e6808b10ff6..6d1e90b1795b2 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -6023,6 +6023,16 @@ hooks = [