Unverified Commit 6b14558a authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove global usage of flutterUsage from gradle (#76330)

parent 050d49ae
...@@ -221,7 +221,7 @@ class AndroidApk extends ApplicationPackage { ...@@ -221,7 +221,7 @@ class AndroidApk extends ApplicationPackage {
File apkFile; File apkFile;
if (androidProject.isUsingGradle) { if (androidProject.isUsingGradle) {
apkFile = await getGradleAppOut(androidProject); apkFile = await getGradleAppOut(androidProject, globals.flutterUsage);
if (apkFile.existsSync()) { if (apkFile.existsSync()) {
// Grab information from the .apk. The gradle build script might alter // Grab information from the .apk. The gradle build script might alter
// the application Id, so we need to look at what was actually built. // the application Id, so we need to look at what was actually built.
......
...@@ -84,6 +84,7 @@ Future<T> runInContext<T>( ...@@ -84,6 +84,7 @@ Future<T> runInContext<T>(
processManager: globals.processManager, processManager: globals.processManager,
fileSystem: globals.fs, fileSystem: globals.fs,
artifacts: globals.artifacts, artifacts: globals.artifacts,
usage: globals.flutterUsage,
), ),
AndroidLicenseValidator: () => AndroidLicenseValidator( AndroidLicenseValidator: () => AndroidLicenseValidator(
operatingSystemUtils: globals.os, operatingSystemUtils: globals.os,
......
...@@ -81,6 +81,7 @@ void main() { ...@@ -81,6 +81,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -172,6 +173,7 @@ void main() { ...@@ -172,6 +173,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -278,6 +280,7 @@ void main() { ...@@ -278,6 +280,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -369,6 +372,7 @@ void main() { ...@@ -369,6 +372,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(FakeCommand( processManager.addCommand(FakeCommand(
command: const <String>[ command: const <String>[
...@@ -432,6 +436,7 @@ void main() { ...@@ -432,6 +436,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -534,6 +539,7 @@ void main() { ...@@ -534,6 +539,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -631,6 +637,7 @@ void main() { ...@@ -631,6 +637,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -746,6 +753,7 @@ void main() { ...@@ -746,6 +753,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -813,6 +821,7 @@ void main() { ...@@ -813,6 +821,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -880,6 +889,7 @@ void main() { ...@@ -880,6 +889,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -940,6 +950,7 @@ void main() { ...@@ -940,6 +950,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_arm'), artifacts: Artifacts.test(localEngine: 'out/android_arm'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1018,6 +1029,7 @@ void main() { ...@@ -1018,6 +1029,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_arm64'), artifacts: Artifacts.test(localEngine: 'out/android_arm64'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1096,6 +1108,7 @@ void main() { ...@@ -1096,6 +1108,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_x86'), artifacts: Artifacts.test(localEngine: 'out/android_x86'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1174,6 +1187,7 @@ void main() { ...@@ -1174,6 +1187,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_x64'), artifacts: Artifacts.test(localEngine: 'out/android_x64'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1252,6 +1266,7 @@ void main() { ...@@ -1252,6 +1266,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
usage: testUsage,
); );
processManager.addCommand( processManager.addCommand(
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
...@@ -1311,6 +1326,7 @@ void main() { ...@@ -1311,6 +1326,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_arm'), artifacts: Artifacts.test(localEngine: 'out/android_arm'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1400,6 +1416,7 @@ void main() { ...@@ -1400,6 +1416,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_arm64'), artifacts: Artifacts.test(localEngine: 'out/android_arm64'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1489,6 +1506,7 @@ void main() { ...@@ -1489,6 +1506,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_x86'), artifacts: Artifacts.test(localEngine: 'out/android_x86'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
...@@ -1578,6 +1596,7 @@ void main() { ...@@ -1578,6 +1596,7 @@ void main() {
processManager: processManager, processManager: processManager,
fileSystem: fileSystem, fileSystem: fileSystem,
artifacts: Artifacts.test(localEngine: 'out/android_x64'), artifacts: Artifacts.test(localEngine: 'out/android_x64'),
usage: testUsage,
); );
processManager.addCommand(const FakeCommand( processManager.addCommand(const FakeCommand(
command: <String>[ command: <String>[
......
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