summaryrefslogtreecommitdiffstats
path: root/base/third_party
diff options
context:
space:
mode:
authormichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-29 20:53:22 +0000
committermichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-29 20:53:22 +0000
commit1e932118a2ad13c144f958e46899b535c7bc0bdd (patch)
tree447007c281c03aeafb4505ff49f453c0d2c6f612 /base/third_party
parent56af67211dafd93bc12756655e20b66b527da7e1 (diff)
downloadchromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.zip
chromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.tar.gz
chromium_src-1e932118a2ad13c144f958e46899b535c7bc0bdd.tar.bz2
Upstream process and thread related code.
BUG= TEST= Review URL: http://codereview.chromium.org/7247015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
-rw-r--r--base/third_party/nspr/prcpucfg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/third_party/nspr/prcpucfg.h b/base/third_party/nspr/prcpucfg.h
index c376524..d6ebb47 100644
--- a/base/third_party/nspr/prcpucfg.h
+++ b/base/third_party/nspr/prcpucfg.h
@@ -36,7 +36,7 @@
#include "base/third_party/nspr/prcpucfg_mac.h"
#elif defined(__native_client__)
#include "base/third_party/nspr/prcpucfg_nacl.h"
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(ANDROID)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__FreeBSD__)
#include "base/third_party/nspr/prcpucfg_freebsd.h"