Commit 02d5da92 authored by Ben Mason's avatar Ben Mason Committed by Commit Bot

Don't build generate_javadoc on preview Android SDK

Bug: 1044636
TBR: pauljensen so we can green up the builders
Change-Id: I59d296744a6b7481262315db2a66d173a39cf4c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016879Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarBen Mason <benmason@chromium.org>
Reviewed-by: default avatarMohamed Heikal <mheikal@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734532}
parent d592caf5
...@@ -1276,45 +1276,49 @@ if (!is_component_build) { ...@@ -1276,45 +1276,49 @@ if (!is_component_build) {
] ]
} }
action("generate_javadoc") { # TODO(crbug.com/1044636) Temporarily disabling generate_javadoc
script = "//components/cronet/tools/generate_javadoc.py" # as it does not work correctly against preview Android SDK
depfile = "$target_gen_dir/$target_name.d" if (android_sdk_release == "q") {
_zip_file = "$target_gen_dir/$target_name.zip" action("generate_javadoc") {
outputs = [ _zip_file ] script = "//components/cronet/tools/generate_javadoc.py"
_annotations_jar = "$root_out_dir/lib.java/third_party/android_deps/androidx_annotation_annotation.jar" depfile = "$target_gen_dir/$target_name.d"
_src_jar = "$_package_dir/cronet_api-src.jar" _zip_file = "$target_gen_dir/$target_name.zip"
inputs = [ outputs = [ _zip_file ]
_annotations_jar, _annotations_jar = "$root_out_dir/lib.java/third_party/android_deps/androidx_annotation_annotation.jar"
_src_jar, _src_jar = "$_package_dir/cronet_api-src.jar"
android_sdk_jar, inputs = [
] _annotations_jar,
_src_jar,
android_sdk_jar,
]
args = [ args = [
"--output-dir", "--output-dir",
rebase_path(_package_dir, root_build_dir), rebase_path(_package_dir, root_build_dir),
"--input-dir", "--input-dir",
rebase_path("//components/cronet", root_build_dir), rebase_path("//components/cronet", root_build_dir),
"--overview-file", "--overview-file",
rebase_path("$_package_dir/README.md.html", root_build_dir), rebase_path("$_package_dir/README.md.html", root_build_dir),
"--readme-file", "--readme-file",
rebase_path("//components/cronet/README.md", root_build_dir), rebase_path("//components/cronet/README.md", root_build_dir),
"--depfile", "--depfile",
rebase_path(depfile, root_build_dir), rebase_path(depfile, root_build_dir),
"--zip-file", "--zip-file",
rebase_path(_zip_file, root_build_dir), rebase_path(_zip_file, root_build_dir),
"--android-sdk-jar", "--android-sdk-jar",
rebase_path(android_sdk_jar, root_build_dir), rebase_path(android_sdk_jar, root_build_dir),
"--support-annotations-jar", "--support-annotations-jar",
rebase_path(_annotations_jar, root_build_dir), rebase_path(_annotations_jar, root_build_dir),
# JavaDoc is generated from Cronet's API source jar. # JavaDoc is generated from Cronet's API source jar.
"--input-src-jar", "--input-src-jar",
rebase_path(_src_jar, root_build_dir), rebase_path(_src_jar, root_build_dir),
] ]
deps = [ deps = [
":jar_cronet_api_source", ":jar_cronet_api_source",
"//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:androidx_annotation_annotation_java",
] ]
}
} }
copy("cronet_package_copy") { copy("cronet_package_copy") {
...@@ -1500,7 +1504,6 @@ if (!is_component_build) { ...@@ -1500,7 +1504,6 @@ if (!is_component_build) {
":cronet_package_copy_resources", ":cronet_package_copy_resources",
":cronet_sizes", ":cronet_sizes",
":cronet_test_package", ":cronet_test_package",
":generate_javadoc",
":generate_licenses", ":generate_licenses",
":jar_cronet_api_source", ":jar_cronet_api_source",
":jar_cronet_impl_common_java_source", ":jar_cronet_impl_common_java_source",
...@@ -1517,6 +1520,11 @@ if (!is_component_build) { ...@@ -1517,6 +1520,11 @@ if (!is_component_build) {
if (current_cpu == "arm" && arm_version == 7) { if (current_cpu == "arm" && arm_version == 7) {
deps += [ ":enforce_no_neon" ] deps += [ ":enforce_no_neon" ]
} }
# Due to crbug.com/1044636 generate_javadoc is only available
# when targeting the q SDK
if (android_sdk_release == "q") {
deps += [ ":generate_javadoc" ]
}
} }
} }
......
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