commit 2ac11b6c8d7542e946f7dbb65be283c3ced37de8
author Dan Willemsen <dwillemsen@google.com> Wed Jan 31 13:54:04 2018 -0800
committer Dan Willemsen <dwillemsen@google.com> Wed Jan 31 17:00:32 2018 -0800
tree 54be2b3c5fa834b7ad8e8584fb8dc6cac7552a09
parent 8aba2458a403479f0743fbc6d35392ae8e598fd1

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

find.cc

diff --git a/find.cc b/find.cc
index a1675d2..1b9e23f 100644
--- a/find.cc
+++ b/find.cc
@@ -733,7 +733,8 @@
         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 @@
 
 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())