Skip to content

Commit

Permalink
Add the Android SDK lambda stub library to the classpath (flutter#17508)
Browse files Browse the repository at this point in the history
Previously the build scripts obtained the lambda support classes from rt.jar,
which is no longer provided by recent versions of the JDK.
  • Loading branch information
jason-simmons authored Apr 7, 2020
1 parent e2fcc66 commit 3190d54
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,24 @@ action("flutter_shell_java") {
source_jar_path,
source_jar_path + ".md5.stamp",
]
inputs = [ android_sdk_jar ] + embedding_dependencies_jars

lambda_jar = "$android_sdk_build_tools/core-lambda-stubs.jar"
inputs = [
android_sdk_jar,
lambda_jar,
] + embedding_dependencies_jars

_rebased_current_path = rebase_path(".")
_rebased_jar_path = rebase_path(jar_path, root_build_dir)
_rebased_source_jar_path = rebase_path(source_jar_path, root_build_dir)
_rebased_depfile = rebase_path(depfile, root_build_dir)
_rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
_rebased_classpath = [ _rebased_android_sdk_jar ] +
rebase_path(embedding_dependencies_jars, root_build_dir)
_rebased_lambda_jar = rebase_path(lambda_jar, root_build_dir)
_rebased_classpath =
[
_rebased_android_sdk_jar,
_rebased_lambda_jar,
] + rebase_path(embedding_dependencies_jars, root_build_dir)

args = [
"--depfile=$_rebased_depfile",
Expand Down

0 comments on commit 3190d54

Please sign in to comment.