diff --git a/build/common.gypi b/build/common.gypi
index e2e9c073e756fe..3cc9053eadf219 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -273,6 +273,11 @@
       # plugins to make call of the main thread.
       'enable_pepper_threading%': 0,
 
+      # Include the PPAPI IPC proxy for NaCl. This is a work-in-progress; this
+      # allows us to build this feature locally without it affecting others
+      # working in affected subsystems like base and ipc.
+      'build_ppapi_ipc_proxy_untrusted%': 0,
+
       # Enables use of the session service, which is enabled by default.
       # Support for disabling depends on the platform.
       'enable_session_service%': 1,
@@ -523,6 +528,7 @@
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     'enable_pepper_threading%': '<(enable_pepper_threading)',
+    'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
     'chromeos%': '<(chromeos)',
     'use_virtual_keyboard%': '<(use_virtual_keyboard)',
     'enable_viewport%': '<(enable_viewport)',
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 2c3323ad0de6e7..7d490f71c9d60e 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -7,6 +7,11 @@
 # in the .gyp files (since ppapi_internal depends on parts of Chrome).
 
 {
+  'conditions': [
+    ['disable_nacl==0 and build_ppapi_ipc_proxy_untrusted==1', {
+      'includes': ['ppapi_proxy_untrusted.gypi'],
+    }],
+  ],
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
   },
diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gypi
similarity index 100%
rename from ppapi/ppapi_proxy_untrusted.gyp
rename to ppapi/ppapi_proxy_untrusted.gypi