Cleaning up references to sdk tools folder

The upstream SDK is now being permanently used as our tools directory.

Bug: 1049245
Change-Id: Idffe05b5c10e8d4a468bb2a663b3d438fb63e2b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040113Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739390}

build/android/BUILD.gn

@@ -41,7 +41,6 @@ if (enable_java_templates) {
     "android_sdk_build_tools=" +
         rebase_path(android_sdk_build_tools, root_build_dir),
     "android_sdk_build_tools_version=$android_sdk_build_tools_version",
-    "android_sdk_tools_version_suffix=$android_sdk_tools_version_suffix",
     "android_sdk_root=" + rebase_path(android_sdk_root, root_build_dir),
     "android_sdk_version=$android_sdk_version",
     "android_ndk_root=" + rebase_path(android_ndk_root, root_build_dir),

build/android/gyp/merge_manifest.py

@@ -16,9 +16,6 @@ import xml.etree.ElementTree as ElementTree
 from util import build_utils
 from util import manifest_utils
 
-# Tools library directory - relative to Android SDK root
-_SDK_TOOLS_LIB_DIR = os.path.join('tools', 'lib')
-
 _MANIFEST_MERGER_MAIN_CLASS = 'com.android.manifmerger.Merger'
 _MANIFEST_MERGER_JARS = [
     'common{suffix}.jar',
@@ -48,10 +45,10 @@ def _ProcessManifest(manifest_path, min_sdk_version, target_sdk_version,
     yield patched_manifest.name, manifest_utils.GetPackage(manifest)
 
 
-def _BuildManifestMergerClasspath(android_sdk_root,
+def _BuildManifestMergerClasspath(android_sdk_tools,
                                   android_sdk_tools_version_suffix):
   return ':'.join([
-      os.path.join(android_sdk_root, _SDK_TOOLS_LIB_DIR,
+      os.path.join(android_sdk_tools, 'lib',
                    jar.format(suffix=android_sdk_tools_version_suffix))
       for jar in _MANIFEST_MERGER_JARS
   ])
@@ -62,7 +59,7 @@ def main(argv):
   parser = argparse.ArgumentParser(description=__doc__)
   build_utils.AddDepfileOption(parser)
   parser.add_argument(
-      '--android-sdk-root',
+      '--android-sdk-tools',
       help='Path to root of SDK providing the manifest merger tool.',
       required=True)
   parser.add_argument(
@@ -91,7 +88,7 @@ def main(argv):
   args = parser.parse_args(argv)
 
   classpath = _BuildManifestMergerClasspath(
-      args.android_sdk_root, args.android_sdk_tools_version_suffix)
+      args.android_sdk_tools, args.android_sdk_tools_version_suffix)
 
   with build_utils.AtomicOutput(args.output) as output:
     cmd = [

build/config/android/config.gni

@@ -71,33 +71,28 @@ if (is_android || is_chromeos) {
     assert(defined(default_android_ndk_major_version))
   }
 
+  public_android_sdk_root = "//third_party/android_sdk/public"
+  android_sdk_tools = "${public_android_sdk_root}/tools"
+  android_sdk_tools_version_suffix = "-26.0.0-dev"
   if (android_sdk_release == "q") {
-    default_android_sdk_root = "//third_party/android_sdk/public"
+    default_android_sdk_root = public_android_sdk_root
     default_android_sdk_version = 29
     default_android_sdk_build_tools_version = "29.0.2"
-    default_android_sdk_tools_version_suffix = "-26.0.0-dev"
     public_android_sdk = true
   }
 
   if (!defined(default_lint_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
-    default_lint_android_sdk_root = "//third_party/android_sdk/public"
+    default_lint_android_sdk_root = public_android_sdk_root
     default_lint_android_sdk_version = 26
   }
 
-  if (!defined(manifest_merger_sdk_root)) {
-    # Purposefully repeated so that downstream can change
-    # default_android_sdk_root without changing manifest merger version.
-    manifest_merger_sdk_root = "//third_party/android_sdk/public"
-    manifest_merger_sdk_version = "-26.0.0-dev"
-  }
-
   if (!defined(default_extras_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing where we load the SDK extras
     # from. (Google Play services, etc.)
-    default_extras_android_sdk_root = "//third_party/android_sdk/public"
+    default_extras_android_sdk_root = public_android_sdk_root
   }
 
   if (!defined(default_android_keystore_path)) {
@@ -137,7 +132,6 @@ if (is_android || is_chromeos) {
     android_sdk_root = default_android_sdk_root
     android_sdk_version = default_android_sdk_version
     android_sdk_build_tools_version = default_android_sdk_build_tools_version
-    android_sdk_tools_version_suffix = default_android_sdk_tools_version_suffix
 
     lint_android_sdk_root = default_lint_android_sdk_root
     lint_android_sdk_version = default_lint_android_sdk_version
@@ -265,7 +259,6 @@ if (is_android || is_chromeos) {
 
   android_sdk =
       "${android_sdk_root}/platforms/android-${android_sdk_platform_version}"
-  android_sdk_tools = "${android_sdk_root}/tools"
   android_sdk_build_tools =
       "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
 

build/config/android/internal_rules.gni

@@ -1757,9 +1757,9 @@ if (enable_java_templates) {
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
-        "--android-sdk-root",
-        rebase_path(manifest_merger_sdk_root, root_build_dir),
-        "--android-sdk-tools-version-suffix=${manifest_merger_sdk_version}",
+        "--android-sdk-tools",
+        rebase_path(android_sdk_tools, root_build_dir),
+        "--android-sdk-tools-version-suffix=${android_sdk_tools_version_suffix}",
         "--root-manifest",
         rebase_path(invoker.input_manifest, root_build_dir),
         "--output",

tools/android/sdk_updater/update_sdk.py

@@ -75,7 +75,7 @@ _DEFAULT_PACKAGES_DICT = {
 
 _GN_ARGUMENTS_TO_UPDATE = {
     'build-tools': 'default_android_sdk_build_tools_version',
-    'tools': 'default_android_sdk_tools_version_suffix',
+    'tools': 'android_sdk_tools_version_suffix',
     'platforms': 'default_android_sdk_version',
 }