[vm/ffi] Cleanup native assets code
I believe this might not be necessary anymore after https://dart-review.googlesource.com/c/sdk/+/361881 and https://dart-review.googlesource.com/c/sdk/+/372500. TEST=pkg/dartdev/test/native_assets/*.dart TEST=tests/ffi/native_assets/*.dart Change-Id: I5127d7c809ac7b7a2193da51458bfd8b4d9c755b Cq-Include-Trybots: dart/try:vm-aot-linux-debug-x64-try,vm-aot-linux-debug-x64c-try,vm-aot-mac-release-arm64-try,vm-aot-mac-release-x64-try,vm-aot-obfuscate-linux-release-x64-try,vm-aot-optimization-level-linux-release-x64-try,vm-aot-win-debug-arm64-try,vm-aot-win-debug-x64-try,vm-aot-win-debug-x64c-try,pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-mac-release-try,pkg-mac-release-arm64-try,pkg-win-release-try,pkg-win-release-arm64-try,vm-aot-asan-linux-release-x64-try,vm-asan-linux-release-x64-try,vm-aot-msan-linux-release-x64-try,vm-msan-linux-release-x64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/377000 Reviewed-by: Tess Strickland <sstrickl@google.com>
This commit is contained in:
@@ -19,15 +19,10 @@ ArrayPtr GetNativeAssetsMap(Thread* thread) {
|
||||
return native_assets_map.ptr();
|
||||
}
|
||||
|
||||
#if defined(DART_PRECOMPILED_RUNTIME)
|
||||
// For now not configuring native assets is supported.
|
||||
return Array::null();
|
||||
#else // defined(DART_PRECOMPILED_RUNTIME)
|
||||
|
||||
const auto& native_assets_library =
|
||||
Library::Handle(zone, object_store->native_assets_library());
|
||||
if (native_assets_library.IsNull()) {
|
||||
// For now not configuring native assets is supported.
|
||||
// Kernel compilation can happen without a native assets library.
|
||||
return Array::null();
|
||||
}
|
||||
|
||||
@@ -77,8 +72,6 @@ ArrayPtr GetNativeAssetsMap(Thread* thread) {
|
||||
native_assets_map = map.Release().ptr();
|
||||
object_store->set_native_assets_map(native_assets_map);
|
||||
return native_assets_map.ptr();
|
||||
|
||||
#endif // defined(DART_PRECOMPILED_RUNTIME)
|
||||
}
|
||||
|
||||
} // namespace dart
|
||||
|
||||
Reference in New Issue
Block a user