Revert of Mojo: Eliminate duplicate C API symbols

mojo/mojo_edk_nacl.gyp

Index: mojo/mojo_edk_nacl.gyp
diff --git a/mojo/mojo_edk_nacl.gyp b/mojo/mojo_edk_nacl.gyp
index ef3de42fca6c85f2b1ac89107dfd08278b4f4ae2..cf340135814584ee880f043244b6dd71ec01e514 100644
--- a/mojo/mojo_edk_nacl.gyp
+++ b/mojo/mojo_edk_nacl.gyp
@@ -3,11 +3,9 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'chromium_code': 1,
-  },
   'includes': [
     '../build/common_untrusted.gypi',
+    'mojo_variables.gypi',
   ],
   'target_defaults' : {
    'include_dirs': [
@@ -32,10 +30,12 @@
         '../base/base_nacl.gyp:base_nacl',
         '../base/base_nacl.gyp:base_nacl_nonsfi',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_public.gyp:mojo_public_system',
+        'mojo_public.gyp:mojo_system_headers',
       ],
       'defines': [
         'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
+        'MOJO_SYSTEM_IMPLEMENTATION',
+        'MOJO_USE_SYSTEM_IMPL',
       ],
       'sources': [
         'edk/embedder/configuration.h',
@@ -126,6 +126,10 @@
         'edk/embedder/test_embedder.cc',
         'edk/embedder/test_embedder.h',
       ],
+      'all_dependent_settings': {
+        # Ensures that dependent projects import the core functions on Windows.
+        'defines': ['MOJO_USE_SYSTEM_IMPL'],
+      },
     },
   ],
 }