Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Ignore EACCES during find emulator opendir

Bug: 37553659
Test: mkdir -p out2/a; sudo chown nobody:nobody out2/a; m -j
Change-Id: Ibc038a8658242e123815ef9de39891e0ee622b57

1 files changed, 1 insertions, 1 deletions

diff --git a/find.cc b/find.cc
index c6a4155..6712923 100644
--- a/find.cc
+++ b/find.cc
@@ -918,7 +918,7 @@ class FindEmulatorImpl : public FindEmulator {
   DirentNode* ConstructDirectoryTree(const string& path) {
     DIR* dir = opendir(path.empty() ? "." : path.c_str());
     if (!dir) {
-      if (errno == ENOENT) {
+      if (errno == ENOENT || errno == EACCES) {
         LOG("opendir failed: %s", path.c_str());
         return NULL;
       } else {