From f987549009717d796f1766938b4f99a9b93c505b Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Tue, 5 Dec 2017 21:50:13 +0100 Subject: [PATCH] [build] Do not fail build if source dir has 'debug' in it. If the source checkout had 'debug' somewhere in the path name, then IsDebuggerFile() marked all modules as debug ones, which triggered an assertion during snapshot generation. Bug: Change-Id: I93537efca9152c5469bb760f32ca53b06351f7a4 Reviewed-on: https://chromium-review.googlesource.com/809205 Reviewed-by: Michael Achenbach Commit-Queue: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#49980} --- AUTHORS | 1 + tools/js2c.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 08391a5566..744d13be8d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -106,6 +106,7 @@ Michael Smith Michaƫl Zasso Mike Gilbert Mike Pennisi +Mikhail Gusarov Milton Chiang Myeong-bo Shim Nicolas Antonius Ernst Leopold Maria Kaiser diff --git a/tools/js2c.py b/tools/js2c.py index 105be0c1b6..0fe5fbad6d 100755 --- a/tools/js2c.py +++ b/tools/js2c.py @@ -365,7 +365,7 @@ class Sources: def IsDebuggerFile(filename): - return "debug" in filename + return os.path.basename(os.path.dirname(filename)) == "debug" def IsMacroFile(filename): return filename.endswith("macros.py")