gecko-dependencies.patch raw

   1  diff --git a/build/moz.configure/android-sdk.configure b/build/moz.configure/android-sdk.configure
   2  index e474b72e3642..8540768625d7 100644
   3  --- a/build/moz.configure/android-sdk.configure
   4  +++ b/build/moz.configure/android-sdk.configure
   5  @@ -239,41 +239,6 @@ def android_emulator(sdk_root, android_os_info, want_bootstrap, avd_manifest):
   6       )
   7   
   8   
   9  -@depends(toolchains_base_dir, "--help")
  10  -@imports(_from="os.path", _import="isdir")
  11  -def bundletool_default_path(toolchains_base_dir, _):
  12  -    return os.path.join(toolchains_base_dir, "bundletool.jar")
  13  -
  14  -
  15  -option(
  16  -    env="ANDROID_BUNDLETOOL_PATH",
  17  -    nargs=1,
  18  -    help="Optional path to a bundletool.jar (like ~/.mozbuild/bundletool.jar). If unset, the default location is used",
  19  -)
  20  -
  21  -
  22  -@depends("ANDROID_BUNDLETOOL_PATH", bundletool_default_path, want_bootstrap)
  23  -@checking("for Bundletool")
  24  -@imports(_from="os.path", _import="exists")
  25  -@imports(_from="mozboot.android", _import="ensure_bundletool")
  26  -def android_bundletool(bundletool_path, bundletool_default_path, want_bootstrap):
  27  -    if bundletool_path:
  28  -        return [bundletool_path[0]]
  29  -
  30  -    if exists(bundletool_default_path):
  31  -        return [bundletool_default_path]
  32  -
  33  -    if not want_bootstrap("android-sdk"):
  34  -        die(
  35  -            "You must install Bundletool.  Try |mach bootstrap|.  (Looked for %s)"
  36  -            % bundletool_default_path
  37  -        )
  38  -
  39  -    ensure_bundletool()
  40  -
  41  -    return [bundletool_default_path]
  42  -
  43  -
  44   @depends(toolchains_base_dir, "--help")
  45   @imports(_from="os.path", _import="isdir")
  46   def avd_default_path(toolchains_base_dir, _):
  47  @@ -353,7 +318,6 @@ set_config("ANDROID_SDK_ROOT", android_sdk_root)
  48   
  49   check_android_tools("zipalign", android_build_tools)
  50   check_android_tools("adb", android_platform_tools)
  51  -check_android_tools("emulator", android_emulator)
  52   check_file("android.jar", android_platforms)
  53   
  54   set_config("ANDROID_BUILD_TOOLS_VERSION", android_sdk_version.build_tools_version)
  55