Tue Aug 5 16:08:45 PDT 2014

Source/bindings/dart/gyp/overrides.gypi

Index: Source/bindings/dart/gyp/overrides.gypi
diff --git a/Source/bindings/dart/gyp/overrides.gypi b/Source/bindings/dart/gyp/overrides.gypi
index 9adccff3753afd0ee6841eb6a17b4fa0b7efadbe..d5d8f9488aa41d4ca1e75005bcffa59fc37c81d5 100644
--- a/Source/bindings/dart/gyp/overrides.gypi
+++ b/Source/bindings/dart/gyp/overrides.gypi
@@ -1,8 +1,13 @@
 {
   'variables': {
+    # We have to nest variables inside variables so that they can be overridden
+    # through GYP_DEFINES.
+    'variables': {
+      'enable_dart_native_extensions%': 0,
+    },
+    'enable_dart_native_extensions%': '<(enable_dart_native_extensions)',
     'additional_target_deps': [
       '../bindings/dart/gyp/dartium.gyp:dart_snapshot#host',
-      '../../../../dart/runtime/dart-runtime.gyp:libdart',
     ],
     'additional_webcore_include_dirs': [
       '..',
@@ -20,5 +25,18 @@
         # FIXMEDART: make conditional.
         '<@(dart_class_id_files)',
     ],
+    'conditions': [
+      ['enable_dart_native_extensions==1', {
+        'additional_target_deps': [
+          # Reference Dart from a shared library which can be used outside of Dartium
+          '../bindings/dart/gyp/dartium.gyp:dart_library',
+        ],
+      }, {
+        'additional_target_deps': [
+          # Link in Dart directly
+          '../../../../dart/runtime/dart-runtime.gyp:libdart',
+        ],
+      }],
+    ],
   },
 }