[cfe] remove whitelist of opt-out packages

Closes https://github.com/dart-lang/sdk/issues/40775

Change-Id: Ib713494edf34046bbf7de43811659863fbc5884e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138901
Reviewed-by: Bob Nystrom <rnystrom@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Sigmund Cherem 2020-03-11 03:19:59 +00:00 committed by commit-bot@chromium.org
parent be548e724e
commit bff20985ce
2 changed files with 9 additions and 122 deletions

View file

@ -387,16 +387,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
loader.target.enableNonNullable &&
languageVersion.major >= enableNonNullableMajorVersion &&
languageVersion.minor >= enableNonNullableMinorVersion &&
!isOptOutPackage(library.importUri) &&
!isOptOutTest(library.importUri);
bool isOptOutPackage(Uri uri) {
if (!uri.isScheme('package')) return false;
if (uri.pathSegments.isEmpty) return false;
String packageName = uri.pathSegments.first;
return optOutPackages.contains(packageName);
}
bool isOptOutTest(Uri uri) {
String path = uri.path;
for (String testDir in ['/tests/', '/generated_tests/']) {
@ -409,120 +401,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
return false;
}
// TODO(johnniwinther): remove this logic. Opted out packages should be
// computed using language versioning and .packages.json.
static final Set<String> optOutPackages = {
'_fe_analyzer_shared',
'analysis_server',
'analysis_server_client',
'analysis_tool',
'analyzer',
'analyzer_cli',
'analyzer_fe_comparison',
'analyzer_plugin',
'args',
'async',
'async_helper',
'bazel_worker',
'benchmark_harness',
'boolean_selector',
'build_integration',
'charcode',
'cli_util',
'collection',
'compiler',
'convert',
'crypto',
'csslib',
'dart2js_info',
'dart2js_tools',
'dart2native',
'dart_internal',
'dart_style',
'dartdoc',
'dartfix',
'dev_compiler',
'diagnostic',
'expect',
'ffi',
'fixnum',
'frontend_server',
'front_end',
'gardening',
'glob',
'html',
'http',
'http_io',
'http_multi_server',
'http_parser',
'http_retry',
'http_throttle',
'intl',
'js',
'js_ast',
'js_runtime',
'json_rpc_2',
'kernel',
'linter',
'logging',
'markdown',
'matcher',
'meta',
'mime',
'mockito',
'modular_test',
'mustache',
'native_stack_traces',
'nnbd_migration',
'oauth2',
'observatory',
'observatory_test_package',
'package_config',
'package_resolver',
'path',
'pedantic',
'pool',
'protobuf',
'pub',
'pub_semver',
'quiver',
'resource',
'sdk_library_metadata',
'shelf',
'shelf_packages_handler',
'shelf_static',
'shelf_web_socket',
'smith',
'source_map_stack_trace',
'sourcemap_testing',
'source_maps',
'source_span',
'stack_trace',
'status_file',
'stream_channel',
'string_scanner',
'telemetry',
'term_glyph',
'test',
'test_api',
'test_core',
'test_descriptor',
'test_process',
'test_reflective_loader',
'test_runner',
'testing',
'tflite_native',
'typed_data',
'unittest',
'usage',
'vm',
'vm_service',
'watcher',
'web_components',
'web_socket_channel',
'yaml',
};
static final Set<String> optOutTestPaths = {
'/tests/co19_2',
'/tests/corelib_2',

View file

@ -10,6 +10,7 @@
"filesets": {
"analyzer_unit_tests": [
".packages",
".dart_tool/package_config.json",
"pkg/",
"tests/compiler/dart2js/",
"third_party/pkg/",
@ -22,6 +23,7 @@
],
"dart2js": [
".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/dart-sdk/",
"out/ReleaseX64/dart-sdk/",
"out/ReleaseX64/gen/utils/dartdevc/",
@ -62,6 +64,7 @@
],
"dart2js_nnbd": [
".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32NNBD/dart-sdk/",
"out/ReleaseX64NNBD/dart-sdk/",
"out/ReleaseX64NNBD/gen/utils/dartdevc/",
@ -105,6 +108,7 @@
],
"dart2js_hostasserts": [
".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/dart",
"out/ReleaseIA32/dart2js_platform.dill",
"out/ReleaseIA32/dart2js_platform_strong.dill",
@ -149,6 +153,7 @@
],
"dart2js_hostasserts_nnbd": [
".packages",
".dart_tool/package_config.json",
"out/ReleaseX64NNBD/dart",
"out/ReleaseX64NNBD/dart2js_platform.dill",
"out/ReleaseX64NNBD/dart2js_platform_strong.dill",
@ -187,6 +192,7 @@
],
"front-end": [
".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/",
"out/ReleaseX64/",
"out/ReleaseX64NNBD/",
@ -253,6 +259,7 @@
"pkg/vm/",
"runtime/",
"sdk/",
".dart_tool/package_config.json",
".packages"
],
"vm-kernel": [
@ -337,6 +344,7 @@
"pkg/vm/",
"runtime/",
"sdk/",
".dart_tool/package_config.json",
".packages",
".vpython"
],
@ -423,6 +431,7 @@
"runtime/",
"sdk/",
"sdk_nnbd/",
".dart_tool/package_config.json",
".packages",
".vpython"
]