Adding base_untrusted.

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 7d8c5945002434f5ec24b048c9d901fe9378d4ba..0a2a8e724505da5573185c27d591cdb05ac62605 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -325,7 +325,7 @@
           'synchronization/waitable_event.h',
           'synchronization/waitable_event_posix.cc',
           'synchronization/waitable_event_watcher.h',
-          'synchronization/waitable_event_watcher_posix.cc',
+          'synchronization/waitable_event_watcher_posix.cc',     
           'synchronization/waitable_event_watcher_win.cc',
           'synchronization/waitable_event_win.cc',
           'system_monitor/system_monitor.cc',
@@ -475,8 +475,8 @@
         'mac_framework_dirs': [
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
-        'conditions': [
-          [ 'use_glib==0', {
+        'target_conditions': [
+          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
@@ -486,17 +486,22 @@
                 'message_pump_aurax11.cc',
               ],
           }],
-          [ 'toolkit_uses_gtk==0', {
-            'sources!': [ 'message_pump_gtk.cc', ],
+          ['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', {
+            'sources!': ['message_pump_gtk.cc'],
           }],
-          [ 'OS != "linux" and os_bsd != 1', {
+          ['(OS != "linux" and <(os_bsd) != 1) or >(nacl_untrusted_build)==1', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'linux_util.cc',
               ],
             },
           ],
-          [ 'OS == "android"', {
+          ['>(nacl_untrusted_build)==1', {
+            'sources!': [
+              'files/file_path_watcher_kqueue.cc',
+            ],
+          }],
+          ['OS == "android" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
               'system_monitor/system_monitor_posix.cc',
@@ -508,30 +513,30 @@
               ['include', '^worker_pool_linux\\.cc$'],
             ],
           }],
-          [ 'OS != "mac"', {
+          ['OS != "mac" or >(nacl_untrusted_build)==1', {
               'sources!': [
                 'mac/scoped_aedesc.h'
               ],
           }],
           # For now, just test the *BSD platforms enough to exclude them.
           # Subsequent changes will include them further.
-          [ 'OS != "freebsd"', {
+          ['OS != "freebsd" or >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
             },
           ],
-          [ 'OS != "openbsd"', {
+          ['OS != "openbsd" or >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
             },
           ],
-          ['OS != "win"', {
+          ['OS != "win" or >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '^win/'] ],
             },
           ],
-          ['OS != "android"', {
+          ['OS != "android" or >(nacl_untrusted_build)==1', {
               'sources/': [ ['exclude', '^android/'] ],
             },
           ],
-          [ 'OS == "win"', {
+          ['OS == "win" and >(nacl_untrusted_build)==0', {
             'include_dirs': [
               '<(DEPTH)/third_party/wtl/include',
             ],
@@ -547,13 +552,13 @@
               'string16.cc',
             ],
           },],
-          [ 'OS == "linux"', {
+          ['OS == "linux" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'files/file_path_watcher_kqueue.cc',
               'files/file_path_watcher_stub.cc',
             ],
           }],
-          [ 'OS == "mac"', {
+          ['OS == "mac" and >(nacl_untrusted_build)==0', {
             'sources/': [
               ['exclude', '^files/file_path_watcher_stub\\.cc$'],
               ['exclude', '^base_paths_posix\\.cc$'],
@@ -561,7 +566,7 @@
               ['exclude', '^sys_string_conversions_posix\\.cc$'],
             ],
           }],
-          [ 'os_bsd==1', {
+          ['<(os_bsd)==1 and >(nacl_untrusted_build)==0', {
             'sources/': [
               ['exclude', '^files/file_path_watcher_linux\\.cc$'],
               ['exclude', '^files/file_path_watcher_stub\\.cc$'],
@@ -571,7 +576,7 @@
               ['exclude', '^sys_info_linux\\.cc$'],
             ],
           }],
-          [ 'chromeos != 1', {
+          ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
             'sources/': [
               ['exclude', '^chromeos/'],
             ],
@@ -605,13 +610,13 @@
         ],
       },
       'conditions': [
-        [ 'use_glib==1', {
+        ['use_glib==1', {
           'conditions': [
-            [ 'chromeos==1', {
+            ['chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
-            [ 'linux_use_tcmalloc==0', {
+            ['linux_use_tcmalloc==0', {
                 'defines': [
                   'NO_TCMALLOC',
                 ],
@@ -622,7 +627,7 @@
                 },
               },
             ],
-            [ 'toolkit_uses_gtk==1', {
+            ['toolkit_uses_gtk==1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
@@ -653,7 +658,7 @@
               ['exclude', '_nss\.cc$'],
             ],
         }],
-        [ 'OS == "android" and _toolset == "host"', {
+        ['OS == "android" and _toolset == "host"', {
           # Base for host support is the minimum required to run the
           # ssl false start blacklist tool. It requires further changes
           # to generically support host builds (and tests).
@@ -685,7 +690,7 @@
             }],
           ],
         }],
-        [ 'OS == "android" and _toolset == "target"', {
+        ['OS == "android" and _toolset == "target"', {
           'conditions': [
             ['target_arch == "ia32"', {
               'sources/': [
@@ -716,28 +721,27 @@
             'debug/stack_trace_posix.cc',
           ],
         }],
-        [ 'os_bsd==1', {
+        ['os_bsd==1', {
           'include_dirs': [
             '/usr/local/include',
           ],
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
-              ],
-            },
+            ],
           },
-        ],
-        [ 'OS == "linux"', {
+        }],
+        ['OS == "linux"', {
           'link_settings': {
-             'libraries': [
-             # We need rt for clock_gettime().
-             '-lrt',
-             # For 'native_library_linux.cc'
-             '-ldl',
-           ],
-         },
+            'libraries': [
+              # We need rt for clock_gettime().
+              '-lrt',
+              # For 'native_library_linux.cc'
+              '-ldl',
+            ],
+          },
         }],
-        [ 'OS == "mac"', {
+        ['OS == "mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -752,10 +756,10 @@
             '../third_party/mach_override/mach_override.gyp:mach_override',
           ],
         }],
-        [ 'OS != "win"', {
+        ['OS != "win"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
         },],
-        [ 'component=="shared_library"', {
+        ['component=="shared_library"', {
           'conditions': [
             ['OS=="win"', {
               'sources!': [
@@ -809,7 +813,7 @@
     },
   ],
   'conditions': [
-    [ 'OS == "win"', {
+    ['OS == "win"', {
       'targets': [
         {
           'target_name': 'base_nacl_win64',
@@ -838,7 +842,7 @@
             },
           },
           'conditions': [
-            [ 'component == "shared_library"', {
+            ['component == "shared_library"', {
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
@@ -873,7 +877,7 @@
         },
       ],
     }],
-    [ 'os_posix==1 and OS!="mac"', {
+    ['os_posix==1 and OS!="mac"', {
       'targets': [
         {
           'target_name': 'symbolize',
@@ -883,7 +887,7 @@
             'chromium_code': 0,
           },
           'conditions': [
-            [ 'OS == "solaris"', {
+            ['OS == "solaris"', {
               'include_dirs': [
                 '/usr/gnu/include',
                 '/usr/gnu/include/libelf',