Commit 7b4292be authored by Eric Stevenson's avatar Eric Stevenson Committed by Commit Bot

Android: Remove jar_path from java_binary_script template.

It results in jar_path being added to the classpath twice.

Bug: 1025364
Change-Id: If126eee1f01f0d71b30173f2a3cadd45d67c5d4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943518
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720276}
parent a62a585e
...@@ -1105,8 +1105,6 @@ if (enable_java_templates) { ...@@ -1105,8 +1105,6 @@ if (enable_java_templates) {
# Variables # Variables
# main_class: The class containing the program entry point. # main_class: The class containing the program entry point.
# build_config: Path to .build_config for the jar (contains classpath). # build_config: Path to .build_config for the jar (contains classpath).
# jar_path: Optional. First classpath entry to be inserted before
# the classpath extracted from the build_config.
# script_name: Name of the script to generate. # script_name: Name of the script to generate.
# wrapper_script_args: List of extra arguments to pass to the executable. # wrapper_script_args: List of extra arguments to pass to the executable.
# #
...@@ -1137,10 +1135,6 @@ if (enable_java_templates) { ...@@ -1137,10 +1135,6 @@ if (enable_java_templates) {
"--main-class", "--main-class",
_main_class, _main_class,
] ]
if (defined(invoker.jar_path)) {
_jar_path_list = [ rebase_path(invoker.jar_path, root_build_dir) ]
args += [ "--classpath=$_jar_path_list" ]
}
args += [ "--classpath=@FileArg($_rebased_build_config:deps_info:java_runtime_classpath)" ] args += [ "--classpath=@FileArg($_rebased_build_config:deps_info:java_runtime_classpath)" ]
if (use_jacoco_coverage) { if (use_jacoco_coverage) {
...@@ -3563,9 +3557,6 @@ if (enable_java_templates) { ...@@ -3563,9 +3557,6 @@ if (enable_java_templates) {
"wrapper_script_args", "wrapper_script_args",
]) ])
build_config = _build_config build_config = _build_config
if (defined(_final_jar_path)) {
jar_path = _final_jar_path
}
script_name = _main_target_name script_name = _main_target_name
if (defined(invoker.wrapper_script_name)) { if (defined(invoker.wrapper_script_name)) {
script_name = invoker.wrapper_script_name script_name = invoker.wrapper_script_name
......
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