remove gleanPythonEnvDir settings

fork-maintainers · Oct 30, 2024 · d986aff · d986aff
1 parent 50eeab9
commit d986aff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -554,7 +554,7 @@ ext {
     // Enable expiration by major version.
     gleanExpireByVersion = Config.majorVersion(project)
     gleanNamespace = "mozilla.telemetry.glean"
-    gleanPythonEnvDir = gradle.mozconfig.substs.GRADLE_GLEAN_PARSER_VENV
+    // gleanPythonEnvDir = gradle.mozconfig.substs.GRADLE_GLEAN_PARSER_VENV
 }
 apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
 apply plugin: "org.mozilla.appservices.nimbus-gradle-plugin"

diff --git a/automation/iceraven/patch_android_components.sh b/automation/iceraven/patch_android_components.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+shopt -s globstar
+
 cp automation/iceraven/assets/*.xml android-components/components/feature/search/src/main/assets/searchplugins
 cp -f automation/iceraven/assets/list.json android-components/components/feature/search/src/main/assets/search
 
@@ -9,5 +11,7 @@ do
   sed -i "41i\    \"$engine\"," android-components/components/feature/search/src/main/java/mozilla/components/feature/search/storage/SearchEngineReader.kt
 done
 
+sed -i "s#gleanPythonEnvDir#// gleanPythonEnvDir#g" android-components/**/*.gradle
+
 git -C android-components apply < automation/iceraven/patches/top_sites_no_most_visted_sites.patch
 git -C android-components apply < automation/iceraven/patches/suggestions_increase_number.patch