Support different findleaves.py path

In newer android trees, build/tools is a symlink to build/make/tools,
and we've started referring to build/make/tools/findleaves.py instead
of build/tools/findleaves.py. Accept either for purposes of the find
emulator.

Change-Id: I3ce66ed3806bff3549a61e85652283bd6f30dc2e

1 files changed, 4 insertions, 2 deletions

diff --git a/find.cc b/find.cc
index a1675d2..1b9e23f 100644
--- a/find.cc
+++ b/find.cc
@@ -733,7 +733,8 @@ class FindCommandParser {
         if (!GetNextToken(&tok) || !tok.empty())
           return false;
         return true;
-      } else if (tok == "build/tools/findleaves.py") {
+      } else if (tok == "build/tools/findleaves.py" ||
+                 tok == "build/make/tools/findleaves.py") {
         if (!ParseFindLeaves())
           return false;
         return true;
@@ -1033,7 +1034,8 @@ FindCommand::~FindCommand() {}
 
 bool FindCommand::Parse(const string& cmd) {
   FindCommandParser fcp(cmd, this);
-  if (!HasWord(cmd, "find") && !HasWord(cmd, "build/tools/findleaves.py"))
+  if (!HasWord(cmd, "find") && !HasWord(cmd, "build/tools/findleaves.py") &&
+      !HasWord(cmd, "build/make/tools/findleaves.py"))
     return false;
 
   if (!fcp.Parse())