GN Build fixes for Flutter + gen_snapshot fix

runtime/vm/BUILD.gn

Index: runtime/vm/BUILD.gn
diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn
index b19dfc86768bf40682a78ccea66e51dabce219ef..672f132e43ac9e338cc56c7c081a4c0984610976 100644
--- a/runtime/vm/BUILD.gn
+++ b/runtime/vm/BUILD.gn
@@ -18,7 +18,7 @@ config("libdart_vm_config") {
 
 
 static_library("libdart_platform") {
-  configs += ["..:dart_config"]
+  configs += ["..:dart_config", "..:dart_product_config"]
   public_configs = [":libdart_vm_config"]
 
   platform_headers_gypi =
@@ -43,9 +43,8 @@ static_library("libdart_platform") {
   ]
 }
 
-
 static_library("libdart_vm") {
-  configs += ["..:dart_config"]
+  configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
   public_configs = [":libdart_vm_config"]
 
   vm_sources_list = exec_script("../../tools/gypi_to_gn.py",
@@ -61,10 +60,10 @@ static_library("libdart_vm") {
 }
 
 
-static_library("libdart_vm_precompiled_runtime") {
-  configs += ["..:dart_config_no_precompiler"]
+static_library("libdart_vm_nosnapshot") {
+  configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
   public_configs = [":libdart_vm_config"]
-  defines = ["DART_PRECOMPILED_RUNTIME"]
+  defines = [ "DART_NO_SNAPSHOT" ]
   vm_sources_list = exec_script("../../tools/gypi_to_gn.py",
                                 [rebase_path("vm_sources.gypi")],
                                 "scope",
@@ -78,8 +77,8 @@ static_library("libdart_vm_precompiled_runtime") {
 }
 
 
-static_library("libdart_vm_nosnapshot") {
-  configs += ["..:dart_config"]
+static_library("libdart_vm_nosnapshot_with_precompiler") {
+  configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiler_config"]
   public_configs = [":libdart_vm_config"]
   defines = [ "DART_NO_SNAPSHOT" ]
   vm_sources_list = exec_script("../../tools/gypi_to_gn.py",
@@ -185,24 +184,24 @@ template("generate_core_libraries") {
   }
 
   static_library("libdart_lib_nosnapshot") {
-    configs += ["..:dart_config"]
+    configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
     deps = libdeps
     sources = libsources + ["bootstrap.cc"] + liboutputs
     include_dirs = [
       "..",
     ]
   }
-  static_library("libdart_lib") {
-    configs += ["..:dart_config"]
-    sources = libsources + [ "bootstrap_nocore.cc", ]
+  static_library("libdart_lib_nosnapshot_with_precompiler") {
+    configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiler_config" ]
+    deps = libdeps
+    sources = libsources + [ "bootstrap.cc"] + liboutputs
     include_dirs = [
       "..",
     ]
   }
-  static_library("libdart_lib_precompiled_runtime") {
-    configs += ["..:dart_config_no_precompiler"]
-    defines = ["DART_PRECOMPILED_RUNTIME"]
-    sources = libsources + [ "bootstrap_nocore.cc", ]
+  static_library("libdart_lib") {
+    configs += ["..:dart_config", "..:dart_product_config", "..:dart_precompiled_runtime_config"]
+    sources = libsources + [ "bootstrap_nocore.cc"]
     include_dirs = [
       "..",
     ]