Revert "[VM/Runtime] Cleanup package config initialization code"

This reverts commit 29e93bcdbd.

Reason for revert: Windows bots are failing with package resolution
errors. Looks like we are missing a windows path sanitization step.

Change-Id: Ib56f7e926b4f385fa3fde74c9c71947f64b8be1c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151469
Reviewed-by: Siva Annamalai <asiva@google.com>
This commit is contained in:
asiva
2020-06-17 00:03:19 +00:00
committed by Siva Annamalai
parent d44457f79d
commit 4b9aa2bd7e
16 changed files with 283 additions and 149 deletions
+1 -13
View File
@@ -3332,17 +3332,6 @@ DART_EXPORT Dart_Port Dart_KernelPort();
*
* \param platform_kernel_size The length of the platform_kernel buffer.
*
* \param incremental_compile Specifies if incremental compilation is needed.
*
* \param package_config Uri of the package configuration file (either in format
* of .packages or .dart_tool/package_config.json) for the null safety
* detection to resolve package imports against. If this parameter is not
* passed the package resolution of the parent isolate should be used.
*
* \param original_working_directory current working directory when the VM
* process was launched, this is used to correctly resolve the path specified
* for package_config.
*
* \return Returns the result of the compilation.
*
* On a successful compilation the returned [Dart_KernelCompilationResult] has
@@ -3360,8 +3349,7 @@ Dart_CompileToKernel(const char* script_uri,
const uint8_t* platform_kernel,
const intptr_t platform_kernel_size,
bool incremental_compile,
const char* package_config,
const char* original_working_directory);
const char* package_config);
typedef struct {
const char* uri;