@@ -35,7 +35,6 @@ final String flutterRoot = path.dirname(path.dirname(path.dirname(path.fromUri(P
3535final  String  flutter =  path.join (flutterRoot, 'bin' , 'flutter$bat ' );
3636final  String  dart =  path.join (flutterRoot, 'bin' , 'cache' , 'dart-sdk' , 'bin' , 'dart$exe ' );
3737final  String  pubCache =  path.join (flutterRoot, '.pub-cache' );
38- final  String  toolRoot =  path.join (flutterRoot, 'packages' , 'flutter_tools' );
3938final  String  engineVersionFile =  path.join (flutterRoot, 'bin' , 'internal' , 'engine.version' );
4039final  String  flutterPluginsVersionFile =  path.join (flutterRoot, 'bin' , 'internal' , 'flutter_plugins.version' );
4140
@@ -1812,31 +1811,6 @@ void adjustEnvironmentToEnableFlutterAsserts(Map<String, String> environment) {
18121811  environment['FLUTTER_TOOL_ARGS' ] =  toolsArgs.trim ();
18131812}
18141813
1815- Map <String , String > _initGradleEnvironment () {
1816-   final  String ?  androidSdkRoot =  (Platform .environment['ANDROID_HOME' ]? .isEmpty ??  true )
1817-       ?  Platform .environment['ANDROID_SDK_ROOT' ]
1818-       :  Platform .environment['ANDROID_HOME' ];
1819-   if  (androidSdkRoot ==  null  ||  androidSdkRoot.isEmpty) {
1820-     print ('${red }Could not find Android SDK; set ANDROID_SDK_ROOT.$reset ' );
1821-     exit (1 );
1822-   }
1823-   return  < String , String > {
1824-     'ANDROID_HOME' :  androidSdkRoot! ,
1825-     'ANDROID_SDK_ROOT' :  androidSdkRoot,
1826-   };
1827- }
1828- 
1829- final  Map <String , String > gradleEnvironment =  _initGradleEnvironment ();
1830- 
1831- void  deleteFile (String  path) {
1832-   // This is technically a race condition but nobody else should be running 
1833-   // while this script runs, so we should be ok. (Sadly recursive:true does not 
1834-   // obviate the need for existsSync, at least on Windows.) 
1835-   final  File  file =  File (path);
1836-   if  (file.existsSync ())
1837-     file.deleteSync ();
1838- }
1839- 
18401814enum  CiProviders  {
18411815  cirrus,
18421816  luci,
@@ -1865,18 +1839,6 @@ CiProviders? get ciProvider {
18651839  return  null ;
18661840}
18671841
1868- /// Returns the name of the branch being tested. 
1869- String  get  branchName {
1870-   switch (ciProvider) {
1871-     case  CiProviders .cirrus: 
1872-       return  Platform .environment['CIRRUS_BRANCH' ]! ;
1873-     case  CiProviders .luci: 
1874-       return  Platform .environment['LUCI_BRANCH' ]! ;
1875-     case  null : 
1876-       return  '' ;
1877-   }
1878- }
1879- 
18801842/// Checks the given file's contents to determine if they match the allowed 
18811843/// pattern for version strings. 
18821844/// 
0 commit comments