Unverified Commit 694d54cc authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

Place build outputs under dart tool (#36585)

parent 22dc6b01
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
import '../base/common.dart'; import '../base/common.dart';
import '../base/context.dart'; import '../base/context.dart';
import '../base/file_system.dart';
import '../build_info.dart'; import '../build_info.dart';
import '../build_system/build_system.dart'; import '../build_system/build_system.dart';
import '../convert.dart'; import '../convert.dart';
...@@ -94,7 +93,9 @@ abstract class AssembleBase extends FlutterCommand { ...@@ -94,7 +93,9 @@ abstract class AssembleBase extends FlutterCommand {
Environment get environment { Environment get environment {
final FlutterProject flutterProject = FlutterProject.current(); final FlutterProject flutterProject = FlutterProject.current();
final Environment result = Environment( final Environment result = Environment(
buildDir: fs.directory(getBuildDirectory()), buildDir: flutterProject.directory
.childDirectory('.dart_tool')
.childDirectory('flutter_build'),
projectDir: flutterProject.directory, projectDir: flutterProject.directory,
defines: _parseDefines(argResults['define']), defines: _parseDefines(argResults['define']),
); );
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
import 'package:args/command_runner.dart'; import 'package:args/command_runner.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/build_system/build_system.dart'; import 'package:flutter_tools/src/build_system/build_system.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/assemble.dart'; import 'package:flutter_tools/src/commands/assemble.dart';
...@@ -39,11 +38,10 @@ void main() { ...@@ -39,11 +38,10 @@ void main() {
defines: <String, String>{ defines: <String, String>{
'BuildMode': 'debug' 'BuildMode': 'debug'
}, projectDir: fs.currentDirectory, }, projectDir: fs.currentDirectory,
buildDir: fs.directory(getBuildDirectory()), buildDir: fs.directory(fs.path.join('.dart_tool', 'flutter_build')).absolute,
); );
expect(bufferLogger.statusText.trim(), expect(bufferLogger.statusText.trim(), environment.buildDir.path);
fs.path.relative(environment.buildDir.path, from: fs.currentDirectory.path));
})); }));
test('Can describe a target', () => testbed.run(() async { test('Can describe a target', () => testbed.run(() async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment