Stop lint.py pulling in implicit dependencies via AndroidManifest.xml

This will mean even fewer UnusedResource checks, but that is covered by:
https://bugs.chromium.org/p/chromium/issues/detail?id=595810

BUG=597007

Review URL: https://codereview.chromium.org/1826563002

Cr-Commit-Position: refs/heads/master@{#382986}

1 files changed, 8 insertions, 2 deletions

diff --git a/build/android/gyp/lint.py b/build/android/gyp/lint.py
index 20484f7..71c1a6f 100755
--- a/build/android/gyp/lint.py
+++ b/build/android/gyp/lint.py
@@ -107,7 +107,6 @@ def _OnStaleMd5(changes, lint_path, config_path, processed_config_path,
       new_dir = os.path.join(temp_dir, str(len(src_dirs)))
       os.mkdir(new_dir)
       src_dirs.append(new_dir)
-      cmd.extend(['--sources', _RelativizePath(new_dir)])
       return new_dir
 
     def PathInDir(d, src):
@@ -121,10 +120,17 @@ def _OnStaleMd5(changes, lint_path, config_path, processed_config_path,
           break
       if not src_dir:
         src_dir = NewSourceDir()
+        cmd.extend(['--sources', _RelativizePath(src_dir)])
       os.symlink(os.path.abspath(src), PathInDir(src_dir, src))
 
+    # Put the manifest in a temporary directory in order to avoid lint detecting
+    # sibling res/ and src/ directories (which should be pass explicitly if they
+    # are to be included).
     if manifest_path:
-      cmd.append(_RelativizePath(os.path.join(manifest_path, os.pardir)))
+      src_dir = NewSourceDir()
+      os.symlink(os.path.abspath(manifest_path),
+                 PathInDir(src_dir, manifest_path))
+      cmd.append(src_dir)
 
     if os.path.exists(result_path):
       os.remove(result_path)