Commit dd544d77 authored by Ben Kirchman's avatar Ben Kirchman Committed by Commit Bot

Move util target inside common jar

Other build and distribution systems are not yet setup to handle another
jar. To avoid having a missing target, move the util library target
inside the common jar, so that it will build properly and be able to be
found by the Java platform implementation of Cronet.

Bug: 669707
Change-Id: I8b98d5f09fb789075734962934a5d9b52a9a561d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733433Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Commit-Queue: Benjamin Kirchman <kirchman@google.com>
Cr-Commit-Position: refs/heads/master@{#683713}
parent 14958259
......@@ -576,7 +576,6 @@ android_java_prebuilt("package_impl_platform_java") {
deps = [
":package_api_java",
":package_impl_common_java",
":package_impl_util_java",
":repackage_platform",
]
}
......@@ -586,7 +585,6 @@ android_java_prebuilt("package_impl_fake_java") {
deps = [
":package_api_java",
":package_impl_common_java",
":package_impl_util_java",
":repackage_fake",
]
}
......@@ -762,7 +760,7 @@ repackage_jars("repackage_native") {
repackage_jars("repackage_common") {
output = "$_package_dir/cronet_impl_common_java.jar"
deps = cronet_impl_common_java_deps_to_package +
[ ":cronet_impl_common_base_java" ]
[ ":cronet_impl_common_base_java", ":cronet_impl_java_util_java" ]
}
if (!is_component_build) {
......
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