[repo_util] Skip clear features on monorepo
* Monorepo is missing the Flutter tool in certain cases
Follow up from https://flutter-review.googlesource.com/c/recipes/+/53281
Bug: None
Change-Id: I842fc53a7753b7f695cc90d37907c187c6996fce
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/53600
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 98058f4..3db0df7 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -452,9 +452,10 @@
] = 'https://storage.googleapis.com/flutter_archives_v2'
env_prefixes = {'PATH': ['%s' % str(flutter_bin), '%s' % str(dart_bin)]}
flutter_exe = 'flutter.bat' if self.m.platform.is_win else 'flutter'
- self.m.step('flutter config --clear-features',
- [flutter_bin.join(flutter_exe), 'config', '--clear-features'],
- )
+ if not self.m.properties.get('gn_artifacts', False):
+ self.m.step('flutter config --clear-features',
+ [flutter_bin.join(flutter_exe), 'config', '--clear-features'],
+ )
return env, env_prefixes
def add_property_env_variables(self, env):
diff --git a/recipe_modules/repo_util/examples/full.expected/mac.json b/recipe_modules/repo_util/examples/full.expected/mac.json
index 7db883a..3e3674c 100644
--- a/recipe_modules/repo_util/examples/full.expected/mac.json
+++ b/recipe_modules/repo_util/examples/full.expected/mac.json
@@ -757,14 +757,6 @@
"name": "git rev-parse"
},
{
- "cmd": [
- "[START_DIR]/flutter/bin/flutter",
- "config",
- "--clear-features"
- ],
- "name": "flutter config --clear-features"
- },
- {
"cmd": [],
"name": "Identify branches (7)"
},
diff --git a/recipe_modules/repo_util/examples/full.expected/win.json b/recipe_modules/repo_util/examples/full.expected/win.json
index 60b2fb3..459503c 100644
--- a/recipe_modules/repo_util/examples/full.expected/win.json
+++ b/recipe_modules/repo_util/examples/full.expected/win.json
@@ -757,14 +757,6 @@
"name": "git rev-parse"
},
{
- "cmd": [
- "[START_DIR]\\flutter\\bin\\flutter.bat",
- "config",
- "--clear-features"
- ],
- "name": "flutter config --clear-features"
- },
- {
"cmd": [],
"name": "Identify branches (7)"
},
