grit: don't fail if crbug_1001171 is not available.

Allows grit's subtree to be used independently.

Bug: 1050744
Change-Id: I1c0283ee37b1cf2af9d7f0b3a8ec03a0f81adf46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2047863
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740430}

tools/grit/grit.py

@@ -13,11 +13,19 @@ import sys
 
 import grit.grit_runner
 
-sys.path.append(os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '..', 'diagnosis')))
-import crbug_1001171
+sys.path.append(
+    os.path.join(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+        'diagnosis'))
+try:
+  import crbug_1001171
+except ImportError:
+  crbug_1001171 = None
 
 
 if __name__ == '__main__':
+  if crbug_1001171:
     with crbug_1001171.DumpStateOnLookupError():
       sys.exit(grit.grit_runner.Main(sys.argv[1:]))
+  else:
+    sys.exit(grit.grit_runner.Main(sys.argv[1:]))

tools/grit/grit/grit_runner.py

@@ -315,9 +315,16 @@ def Main(args):
 
 
 if __name__ == '__main__':
-  sys.path.append(os.path.abspath(
-      os.path.join(os.path.dirname(__file__), '..', '..', 'diagnosis')))
+  sys.path.append(
+      os.path.join(
+          os.path.dirname(
+              os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
+          'diagnosis'))
+  try:
     import crbug_1001171
-
     with crbug_1001171.DumpStateOnLookupError():
       sys.exit(Main(sys.argv[1:]))
+  except ImportError:
+    pass
+
+  sys.exit(Main(sys.argv[1:]))