Skip to content

Commit

Permalink
[flutter roll] Revert "Native assets support for Linux" (flutter#135069)
Browse files Browse the repository at this point in the history 
Reverts flutter#134031

context: b/301051367
Looked at the error message from the broken TAP target, but seems like the failure might be non trivial to resolve. Would it be okay if we revert this for now while it is being triaged?

Update packages/flutter/lib/src/widgets/editable_text.dart

Co-authored-by: Renzo Olivares <[email protected]>

Update editable_text.dart

Update editable_text.dart
  • Loading branch information
@XilaiZhang @Mairramer
XilaiZhang authored and Mairramer committed Oct 10, 2023
1 parent 194bf76 commit 5b5a3d1
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 922 deletions.
24 changes: 8 additions & 16 deletions .ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,10 951,8 @@ targets:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "chrome_and_driver", "version": "version:117.0"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"}
{"dependency": "open_jdk", "version": "version:11"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
]
shard: tool_integration_tests
subshard: "1_4"
Expand All @@ -977,10 975,8 @@ targets:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "chrome_and_driver", "version": "version:117.0"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"}
{"dependency": "open_jdk", "version": "version:11"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
]
shard: tool_integration_tests
subshard: "2_4"
Expand All @@ -1003,10 999,8 @@ targets:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "chrome_and_driver", "version": "version:117.0"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"}
{"dependency": "open_jdk", "version": "version:11"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
]
shard: tool_integration_tests
subshard: "3_4"
Expand All @@ -1029,10 1023,8 @@ targets:
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "chrome_and_driver", "version": "version:117.0"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"},
{"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"}
{"dependency": "open_jdk", "version": "version:11"},
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
]
shard: tool_integration_tests
subshard: "4_4"
Expand Down
8 changes: 5 additions & 3 deletions packages/flutter/lib/src/widgets/editable_text.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 1403,9 @@ class EditableText extends StatefulWidget {
final VoidCallback? onSelectionHandleTapped;

/// {@template flutter.widgets.editableText.onTapOutside}
/// Called for each tap that occurs outside of the[TextFieldTapRegion] group
/// Called for each tap that occurs outside of the [TextFieldTapRegion] group
/// when [canTapOutsideFocus] is set to true.
/// When [canTapOutsideFocus] is set to false, this method will be called only
/// when the text field is focused.
///
/// If this is null, [FocusNode.unfocus] will be called on the [focusNode] for
Expand All @@ -1424,8 1426,6 @@ class EditableText extends StatefulWidget {
/// notification. It is possible that the event may occur outside of the
/// immediate bounding box defined by the text field, although it will be
/// within the bounding box of a [TextFieldTapRegion] member.
/// This method will not be called when [EditableText.canTapOutsideFocus] is set
/// to false or when [EditableText] is not focused.
/// {@endtemplate}
///
/// {@tool dartpad}
Expand Down Expand Up @@ -1852,6 1852,8 @@ class EditableText extends StatefulWidget {

/// {@template flutter.widgets.editableText.canTapOutsideFocus}
/// Determine whether [onTapOutside] is called when this widget is not focused.
///
/// Defaults to true.
/// {@endtemplate}
final bool canTapOutsideFocus;

Expand Down
27 changes: 2 additions & 25 deletions packages/flutter_tools/lib/src/build_system/targets/native_assets.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 12,6 @@ import '../../base/platform.dart';
import '../../build_info.dart';
import '../../dart/package_map.dart';
import '../../ios/native_assets.dart';
import '../../linux/native_assets.dart';
import '../../macos/native_assets.dart';
import '../../macos/xcode.dart';
import '../../native_assets.dart';
Expand Down Expand Up @@ -119,21 118,6 @@ class NativeAssets extends Target {
fileSystem: fileSystem,
buildRunner: buildRunner,
);
case TargetPlatform.linux_arm64:
case TargetPlatform.linux_x64:
final String? environmentBuildMode = environment.defines[kBuildMode];
if (environmentBuildMode == null) {
throw MissingDefineException(kBuildMode, name);
}
final BuildMode buildMode = BuildMode.fromCliName(environmentBuildMode);
(_, dependencies) = await buildNativeAssetsLinux(
targetPlatform: targetPlatform,
buildMode: buildMode,
projectUri: projectUri,
yamlParentDirectory: environment.buildDir.uri,
fileSystem: fileSystem,
buildRunner: buildRunner,
);
case TargetPlatform.tester:
if (const LocalPlatform().isMacOS) {
(_, dependencies) = await buildNativeAssetsMacOS(
Expand All @@ -145,15 129,6 @@ class NativeAssets extends Target {
buildRunner: buildRunner,
flutterTester: true,
);
} else if (const LocalPlatform().isLinux) {
(_, dependencies) = await buildNativeAssetsLinux(
buildMode: BuildMode.debug,
projectUri: projectUri,
yamlParentDirectory: environment.buildDir.uri,
fileSystem: fileSystem,
buildRunner: buildRunner,
flutterTester: true,
);
} else {
// TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757
// Write the file we claim to have in the [outputs].
Expand All @@ -167,6 142,8 @@ class NativeAssets extends Target {
case TargetPlatform.android:
case TargetPlatform.fuchsia_arm64:
case TargetPlatform.fuchsia_x64:
case TargetPlatform.linux_arm64:
case TargetPlatform.linux_x64:
case TargetPlatform.web_javascript:
case TargetPlatform.windows_x64:
// TODO(dacoharkes): Implement other OSes. https://github.com/flutter/flutter/issues/129757
Expand Down
2 changes: 0 additions & 2 deletions packages/flutter_tools/lib/src/linux/build_linux.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 17,6 @@ import '../convert.dart';
import '../flutter_plugins.dart';
import '../globals.dart' as globals;
import '../migrations/cmake_custom_command_migration.dart';
import '../migrations/cmake_native_assets_migration.dart';

// Matches the following error and warning patterns:
// - <file path>:<line>:<column>: (fatal) error: <error...>
Expand Down Expand Up @@ -46,7 45,6 @@ Future<void> buildLinux(

final List<ProjectMigrator> migrators = <ProjectMigrator>[
CmakeCustomCommandMigration(linuxProject, logger),
CmakeNativeAssetsMigration(linuxProject, 'linux', logger),
];

final ProjectMigration migration = ProjectMigration(migrators);
Expand Down
238 changes: 0 additions & 238 deletions packages/flutter_tools/lib/src/linux/native_assets.dart
View file

This file was deleted.

Loading

0 comments on commit 5b5a3d1

Please sign in to comment.