Skip to content

Instantly share code, notes, and snippets.

@ncalexan
Created October 11, 2017 23:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ncalexan/bbc2e75a5e05804bd1164cc4a419358f to your computer and use it in GitHub Desktop.
Save ncalexan/bbc2e75a5e05804bd1164cc4a419358f to your computer and use it in GitHub Desktop.
diff -r bcf17c23b631 python/mozboot/mozboot/android.py
--- a/python/mozboot/mozboot/android.py Wed Oct 11 15:23:45 2017 -0700
+++ b/python/mozboot/mozboot/android.py Wed Oct 11 15:59:47 2017 -0700
@@ -179,15 +179,16 @@ def ensure_android(os_name, artifact_mod
path = os.path.join(mozbuild_path, 'android-sdk-{0}'.format(os_name), 'licenses')
ensure_dir(path)
licenses = {
- 'android-sdk-license': '8933bad161af4178b1185d1a37fbf41ea5269c55',
- 'android-sdk-preview-license': '84831b9409646a918e30573bab4c9c91346d8abd',
+ 'android-sdk-license': ['8933bad161af4178b1185d1a37fbf41ea5269c55',
+ 'd56f5187479451eabf01fb78af6dfcb131a6481e'],
+ 'android-sdk-preview-license': ['84831b9409646a918e30573bab4c9c91346d8abd'],
}
- for license, tag in licenses.items():
+ for license, tags in licenses.items():
lname = os.path.join(path, license)
if not os.path.isfile(lname):
- open(lname, 'w').write('\n{0}\n'.format(tag))
+ open(lname, 'w').write('\n{0}'.format('\n'.join(tags)))
# We expect the |sdkmanager| tool to be at
# ~/.mozbuild/android-sdk-$OS_NAME/tools/bin/sdkmanager.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment