Index: base/base.gypi |
diff --git a/base/base.gypi b/base/base.gypi |
index 7194f24443a0da4568a25d694377e444d18252f6..f449c20732c901bbcd19749f93301d7afa375b4c 100644 |
--- a/base/base.gypi |
+++ b/base/base.gypi |
@@ -471,6 +471,8 @@ |
'threading/non_thread_safe_impl.cc', |
'threading/non_thread_safe_impl.h', |
'threading/platform_thread.h', |
+ 'threading/platform_thread_android.cc', |
+ 'threading/platform_thread_linux.cc', |
'threading/platform_thread_mac.mm', |
'threading/platform_thread_posix.cc', |
'threading/platform_thread_win.cc', |
@@ -645,8 +647,11 @@ |
'threading/sequenced_worker_pool.cc', |
'third_party/dynamic_annotations/dynamic_annotations.c', |
], |
- # Metrics won't work in the NaCl sandbox. |
- 'sources/': [ ['exclude', '^metrics/'] ], |
+ 'sources/': [ |
+ # Metrics won't work in the NaCl sandbox. |
+ ['exclude', '^metrics/'], |
+ ['include', '^threading/platform_thread_linux\\.cc$'], |
+ ], |
}], |
['OS == "android" and >(nacl_untrusted_build)==0', { |
'sources!': [ |
@@ -664,6 +669,12 @@ |
['include', '^worker_pool_linux\\.cc$'], |
], |
}], |
+ ['OS == "android" and _toolset == "host" and host_os == "linux"', { |
+ 'sources/': [ |
+ # Pull in specific files for host builds. |
+ ['include', '^threading/platform_thread_linux\\.cc$'], |
+ ], |
+ }], |
['OS == "ios"', { |
'sources/': [ |
# Pull in specific Mac files for iOS (which have been filtered out |