gyps! and builds!

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index d5eb0ca286d0e84aa8c31ef03ee2f44952ade28a..f502fb948d65db55d4ccce4ac3cbdafb32665f59 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -784,14 +784,12 @@
             ],
           }],
           ['OS == "android" and _toolset == "target" and >(nacl_untrusted_build)==0', {
-           'sources': [
-             'memory/discardable_memory_ashmem_allocator.cc',
-             'memory/discardable_memory_ashmem_allocator.h',
-             'memory/discardable_memory_ashmem.cc',
-             'memory/discardable_memory_ashmem.h',
-           ],
-          }],
-          ['OS == "android" and >(nacl_untrusted_build)==0', {
+            'sources': [
+              'memory/discardable_memory_ashmem_allocator.cc',
+              'memory/discardable_memory_ashmem_allocator.h',
+              'memory/discardable_memory_ashmem.cc',
+              'memory/discardable_memory_ashmem.h',
+            ],
             'sources!': [
               'base_paths_posix.cc',
               'files/file_path_watcher_fsevents.cc',
@@ -928,7 +926,7 @@
               'files/file_path_watcher_stub.cc',
             ],
           }],
-          ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
+          ['(OS == "mac" or OS == "ios" or OS=="android" and _toolset=="host" and host_os=="mac") and >(nacl_untrusted_build)==0', {
             'sources/': [
               ['exclude', '^files/file_path_watcher_stub\\.cc$'],
               ['exclude', '^base_paths_posix\\.cc$'],