Pass path to platform kernel binary to kernel-service.

runtime/vm/kernel_isolate.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/kernel_isolate.h"
 
 #include "bin/dartutils.h"
 #include "include/dart_native_api.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 281 matching lines @@
 
   ~KernelCompilationRequest() {
     UnregisterRequest(this);
     Dart_CloseNativePort(port_);
     delete monitor_;
   }
 
   Dart_KernelCompilationResult SendAndWaitForResponse(
       Dart_Port kernel_port,
       const char* script_uri,
+      const char* platform_kernel,
       int source_files_count,
       Dart_SourceFile source_files[],
       bool incremental_compile) {
-    // Build the [null, send_port, script_uri, incremental_compile, isolate_id,
-    // [files]] message for the Kernel isolate: null tag tells it that request
-    // came from this code, instead of Loader so that it can given a more
-    // informative response.
+    // Build the [null, send_port, script_uri, platform_kernel,
+    // incremental_compile, isolate_id, [files]] message for the Kernel isolate.
+    // null tag tells it that request came from this code, instead of Loader
+    // so that it can given a more informative response.
     Dart_CObject tag;
     tag.type = Dart_CObject_kNull;
 
     Dart_CObject send_port;
     send_port.type = Dart_CObject_kSendPort;
     send_port.value.as_send_port.id = port_;
     send_port.value.as_send_port.origin_id = ILLEGAL_PORT;
 
     Dart_CObject uri;
     uri.type = Dart_CObject_kString;
     uri.value.as_string = const_cast<char*>(script_uri);
 
+    Dart_CObject dart_platform_kernel;
+    if (platform_kernel != NULL) {
+      dart_platform_kernel.type = Dart_CObject_kString;
+      dart_platform_kernel.value.as_string = const_cast<char*>(platform_kernel);
+    } else {
+      dart_platform_kernel.type = Dart_CObject_kNull;
+    }
+
     Dart_CObject dart_incremental;
     dart_incremental.type = Dart_CObject_kBool;
     dart_incremental.value.as_bool = incremental_compile;
 
     // TODO(aam): Assert that isolate exists once we move CompileAndReadScript
     // compilation logic out of CreateIsolateAndSetupHelper and into
     // IsolateSetupHelper in main.cc.
     Isolate* isolate =
         Thread::Current() != NULL ? Thread::Current()->isolate() : NULL;
     if (incremental_compile) {
       ASSERT(isolate != NULL);
     }
     Dart_CObject isolate_id;
     isolate_id.type = Dart_CObject_kInt64;
     isolate_id.value.as_int64 =
         isolate != NULL ? static_cast<int64_t>(isolate->main_port()) : 0;
 
     Dart_CObject message;
     message.type = Dart_CObject_kArray;
 
-    intptr_t message_len = 5;
+    intptr_t message_len = 6;
     Dart_CObject files;
     if (source_files_count != 0) {
       files = BuildFilesPairs(source_files_count, source_files);
       message_len++;
     }
     Dart_CObject* message_arr[] = {
-        &tag, &send_port, &uri, &dart_incremental, &isolate_id, &files};
+        &tag,        &send_port, &uri, &dart_platform_kernel, &dart_incremental,
+        &isolate_id, &files};
     message.value.as_array.values = message_arr;
     message.value.as_array.length = message_len;
     // Send the message.
     Dart_PostCObject(kernel_port, &message);
 
     // Wait for reply to arrive.
     MonitorLocker ml(monitor_);
     while (result_.status == Dart_KernelCompilationStatus_Unknown) {
       ml.Wait();
     }
@@ skipping 93 matching lines @@
   KernelCompilationRequest* prev_;
 
   Dart_KernelCompilationResult result_;
 };
 
 Monitor* KernelCompilationRequest::requests_monitor_ = new Monitor();
 KernelCompilationRequest* KernelCompilationRequest::requests_ = NULL;
 
 Dart_KernelCompilationResult KernelIsolate::CompileToKernel(
     const char* script_uri,
+    const char* platform_kernel,
     int source_file_count,
     Dart_SourceFile source_files[],
     bool incremental_compile) {
   // This must be the main script to be loaded. Wait for Kernel isolate
   // to finish initialization.
   Dart_Port kernel_port = WaitForKernelPort();
   if (kernel_port == ILLEGAL_PORT) {
     Dart_KernelCompilationResult result;
     result.status = Dart_KernelCompilationStatus_Unknown;
     result.error = strdup("Error while initializing Kernel isolate");
     return result;
   }
 
   KernelCompilationRequest request;
   return request.SendAndWaitForResponse(kernel_port, script_uri,
-                                        source_file_count, source_files,
-                                        incremental_compile);
+                                        platform_kernel, source_file_count,
+                                        source_files, incremental_compile);
 }
 
 #endif  // DART_PRECOMPILED_RUNTIME
 
 }  // namespace dart