Fix fetch_all.py script with internal --android-deps-dir

This CL:
- Makes BuildConfigGenerator.groovy and fetch_all.py agree with the
expected directory of the generated DEPS file
- Fixes cipd_path computation in ParseDeps() in fetch_all.py

BUG=None

Change-Id: I13375cdec9478f196a3e026e2fc2e21197c03c28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500564Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821041}

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -100,7 +100,6 @@ class BuildConfigGenerator extends DefaultTask {
 
         def graph = new ChromiumDepGraph(project: project, skipLicenses: skipLicenses)
         def normalisedRepoPath = normalisePath(repositoryPath)
-        def rootDirPath = normalisePath(".")
 
         // 1. Parse the dependency data
         graph.collectDependencies()
@@ -158,7 +157,7 @@ class BuildConfigGenerator extends DefaultTask {
         // 3. Generate the root level build files
         updateBuildTargetDeclaration(graph, repositoryPath, normalisedRepoPath)
         updateDepsDeclaration(graph, cipdBucket, stripFromCipdPath, repositoryPath,
-                              "${rootDirPath}/DEPS")
+                              "${normalisedRepoPath}/../../DEPS")
         dependencyDirectories.sort { path1, path2 -> return path1.compareTo(path2) }
         updateReadmeReferenceFile(dependencyDirectories,
                                   "${normalisedRepoPath}/additional_readme_paths.json")

third_party/android_deps/fetch_all.py

@@ -361,6 +361,7 @@ def ParseDeps(root_dir, libs_dir):
     and |package_name| and |package_tag| are the extracted from it.
   """
     result = {}
+    root_dir = os.path.abspath(root_dir)
     libs_dir = os.path.abspath(os.path.join(root_dir, libs_dir))
     for cipd_file in FindInDirectory(libs_dir, 'cipd.yaml'):
         pkg_name, pkg_tag = GetCipdPackageInfo(cipd_file)