Merge pull request flutter#2464 from collinjackson/enable_conditional…

…_directives Enable conditional directives
majido · Mar 7, 2016 · d167f5b · d167f5b
2 parents a5b4299 + 22d7bc4
commit d167f5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/sky/engine/core/script/dart_init.cc b/sky/engine/core/script/dart_init.cc
@@ -86,6 +86,10 @@ static const char* kDartBackgroundCompilationArgs[] = {
   "--background_compilation",
 };
 
+static const char *kDartConditionalDirectivesArgs[] = {
+    "--conditional_directives",
+};
+
 static const char* kDartCheckedModeArgs[] = {
     "--enable_asserts",
     "--enable_type_checks",
@@ -324,6 +328,7 @@ void InitDartVM() {
 
   Vector<const char*> args;
   args.append(kDartProfilingArgs, arraysize(kDartProfilingArgs));
+  args.append(kDartConditionalDirectivesArgs, arraysize(kDartConditionalDirectivesArgs));
 
   if (!IsRunningPrecompiledCode()) {
     // The version of the VM setup to run precompiled code does not recognize

diff --git a/sky/tools/sky_snapshot/vm.cc b/sky/tools/sky_snapshot/vm.cc
@@ -16,6 +16,7 @@ extern void* kDartIsolateSnapshotBuffer;
 static const char* kDartArgs[] = {
     "--enable_mirrors=false",
     "--load_deferred_eagerly=true",
+    "--conditional_directives",
 };
 
 void InitDartVM() {