зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1761011 - Don't require tools directory in Android SDK. r=mhentges
This package is obsolete and we don't use it anymore. Differential Revision: https://phabricator.services.mozilla.com/D141865
This commit is contained in:
Родитель
104d84a205
Коммит
31cdbe04d0
|
@ -111,17 +111,6 @@ def android_build_tools(sdk_root, sdk_version):
|
|||
)
|
||||
|
||||
|
||||
@depends(android_sdk_root)
|
||||
@checking("for Android tools")
|
||||
@imports(_from="os.path", _import="isdir")
|
||||
def android_tools(sdk_root):
|
||||
tools = os.path.join(sdk_root, "tools")
|
||||
if isdir(tools):
|
||||
return tools
|
||||
|
||||
die("You must install the Android tools. Try |mach bootstrap|")
|
||||
|
||||
|
||||
@depends(android_sdk_root)
|
||||
@checking("for Android platform-tools")
|
||||
@imports(_from="os.path", _import="exists")
|
||||
|
@ -163,7 +152,6 @@ check_android_tools("adb", android_platform_tools)
|
|||
check_android_tools("emulator", android_emulator_path)
|
||||
|
||||
set_config("ANDROID_SDK_ROOT", android_sdk_root)
|
||||
set_config("ANDROID_TOOLS", android_tools)
|
||||
|
||||
set_config("ANDROID_BUILD_TOOLS_VERSION", android_sdk_version.build_tools_version)
|
||||
set_config("ANDROID_TARGET_SDK", android_sdk_version.target_sdk_version)
|
||||
|
|
Загрузка…
Ссылка в новой задаче