squash! squash! config-apk: Include information about the config pack…

…age for on browser and webview build targets

patches/0126-config-Generate-ConfigInfo-from-config-apk.patch

@@ -4,16 +4,16 @@ Date: Wed, 6 Dec 2023 15:45:43 +0000
 Subject: [PATCH] config: Generate ConfigInfo from config apk
 
 ---
- vanadium/android_config/config_apk.gni        | 30 ++++++++++
+ vanadium/android_config/config_apk.gni        | 24 ++++++++
  .../java/templates/ConfigInfo.template        | 60 +++++++++++++++++++
- 2 files changed, 90 insertions(+)
+ 2 files changed, 84 insertions(+)
  create mode 100644 vanadium/android_config/java/templates/ConfigInfo.template
 
 diff --git a/vanadium/android_config/config_apk.gni b/vanadium/android_config/config_apk.gni
-index c7548d44cc63b..bcab087b475f3 100644
+index c7548d44cc63b..0753daee03707 100644
 --- a/vanadium/android_config/config_apk.gni
 +++ b/vanadium/android_config/config_apk.gni
-@@ -94,3 +94,33 @@ template("config_apk_tmpl") {
+@@ -94,3 +94,27 @@ template("config_apk_tmpl") {
      forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
    }
  }
@@ -38,12 +38,6 @@ index c7548d44cc63b..bcab087b475f3 100644
 +          "_IS_DEBUG",
 +        ]
 +      }
-+
-+      if (config_apk_requires_system) {
-+        defines += [
-+          "_REQUIRES_SYSTEM",
-+        ]
-+      }
 +    }
 +  }
 +}