Commit d2167d6a authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

android: Fix broken licenseUrl in //third_party/android_deps

This checks in a .txt copy of the broken license.

Also enables a --debug flag to debug issues like this in the future.

Bug: 982846
Change-Id: I015e7d0a1155d3d5cc55b9a1556b2ce5ec706d98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1695817
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676134}
parent 2bb818b7
This diff is collapsed.
...@@ -52,6 +52,9 @@ class ChromiumDepGraph { ...@@ -52,6 +52,9 @@ class ChromiumDepGraph {
url: "https://github.com/google-ar/arcore-android-sdk", url: "https://github.com/google-ar/arcore-android-sdk",
licenseUrl: "https://raw.githubusercontent.com/google-ar/arcore-android-sdk/master/LICENSE", licenseUrl: "https://raw.githubusercontent.com/google-ar/arcore-android-sdk/master/LICENSE",
licenseName: "Apache 2.0"), licenseName: "Apache 2.0"),
'javax_annotation_jsr250_api': new DependencyDescription(
licenseName: "CDDLv1.0",
licensePath: "licenses/CDDLv1.0.txt"),
'net_sf_kxml_kxml2': new DependencyDescription( 'net_sf_kxml_kxml2': new DependencyDescription(
licenseUrl: "https://raw.githubusercontent.com/stefanhaustein/kxml2/master/license.txt", licenseUrl: "https://raw.githubusercontent.com/stefanhaustein/kxml2/master/license.txt",
licenseName: "MIT"), licenseName: "MIT"),
......
...@@ -340,8 +340,8 @@ def main(): ...@@ -340,8 +340,8 @@ def main():
parser.add_argument('--reset-workspace', action='store_true', parser.add_argument('--reset-workspace', action='store_true',
help='Reset your Chromium workspace to its HEAD state, but preserves ' help='Reset your Chromium workspace to its HEAD state, but preserves '
'build.gradle changes. Use this to undo previous --update-all changes.') 'build.gradle changes. Use this to undo previous --update-all changes.')
parser.add_argument('--log-level', help='Set log level (e.g. \'info\' or ' parser.add_argument(
'\'debug\')') '--debug', actino='store_true', help='Enable debug logging')
args = parser.parse_args() args = parser.parse_args()
# Determine Chromium source tree. # Determine Chromium source tree.
...@@ -373,8 +373,8 @@ def main(): ...@@ -373,8 +373,8 @@ def main():
logging.basicConfig(format='%(message)s') logging.basicConfig(format='%(message)s')
logger = logging.getLogger() logger = logging.getLogger()
if args.log_level: if args.debug:
logger.setLevel(args.log_level.upper()) logger.setLevel('DEBUG')
# Handle --reset-workspace here. # Handle --reset-workspace here.
if args.reset_workspace: if args.reset_workspace:
...@@ -435,6 +435,9 @@ def main(): ...@@ -435,6 +435,9 @@ def main():
'setupRepository', 'setupRepository',
'--stacktrace', '--stacktrace',
] ]
if args.debug:
gradle_cmd.append('--debug')
RunCommand(gradle_cmd) RunCommand(gradle_cmd)
libs_dir = os.path.join(build_dir, args.git_dir, _ANDROID_DEPS_LIBS_SUBDIR) libs_dir = os.path.join(build_dir, args.git_dir, _ANDROID_DEPS_LIBS_SUBDIR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment