Version 2.11.0-165.0.dev

Merge commit '11f15f512535c51e0ba73c8c308d821f1e197691' into 'dev'

Author: Dart CI

runtime/BUILD.gn

@@ -208,6 +208,7 @@ source_set("dart_api") {
   sources = [
     "include/dart_api.h",
     "include/dart_api_dl.h",
+    "include/dart_native_api.c",
     "include/dart_native_api.h",
     "include/dart_tools_api.h",
     "include/dart_version.h",

runtime/include/dart_api_dl.c

@@ -4,9 +4,9 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
-#include "include/dart_api_dl.h"
-#include "include/dart_version.h"
-#include "include/internal/dart_api_dl_impl.h"
+#include "dart_api_dl.h"               /* NOLINT */
+#include "dart_version.h"              /* NOLINT */
+#include "internal/dart_api_dl_impl.h" /* NOLINT */
 
 #include <string.h>
 

runtime/include/dart_api_dl.h

@@ -7,8 +7,8 @@
 #ifndef RUNTIME_INCLUDE_DART_API_DL_H_
 #define RUNTIME_INCLUDE_DART_API_DL_H_
 
-#include "include/dart_api.h"
-#include "include/dart_native_api.h"
+#include "dart_api.h"        /* NOLINT */
+#include "dart_native_api.h" /* NOLINT */
 
 /** \mainpage Dynamically Linked Dart API
  *

sdk/BUILD.gn

@@ -755,13 +755,16 @@ copy("copy_headers") {
   visibility = [ ":create_common_sdk" ]
   sources = [
     "../runtime/include/dart_api.h",
+    "../runtime/include/dart_api_dl.c",
     "../runtime/include/dart_api_dl.h",
     "../runtime/include/dart_native_api.h",
     "../runtime/include/dart_tools_api.h",
     "../runtime/include/dart_version.h",
     "../runtime/include/internal/dart_api_dl_impl.h",
   ]
-  outputs = [ "$root_out_dir/dart-sdk/include/{{source_file_part}}" ]
+
+  # Some magic to recover the folder structure inside the include folder.
+  outputs = [ "$root_out_dir/dart-sdk/include/{{source_root_relative_dir}}/../../{{source_file_part}}" ]
 }
 
 # This rule copies libraries.json files to lib/

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 11
 PATCH 0
-PRERELEASE 164
+PRERELEASE 165
 PRERELEASE_PATCH 0