From 33843702fec60bd8401291ebcb13f81598443003 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 7 Apr 2020 11:24:52 -0700 Subject: [PATCH] Add the Android SDK lambda stub library to the classpath (flutter/engine#17508) Previously the build scripts obtained the lambda support classes from rt.jar, which is no longer provided by recent versions of the JDK. --- .../src/flutter/shell/platform/android/BUILD.gn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/BUILD.gn b/engine/src/flutter/shell/platform/android/BUILD.gn index 940801e7f3e..77d4192cb50 100644 --- a/engine/src/flutter/shell/platform/android/BUILD.gn +++ b/engine/src/flutter/shell/platform/android/BUILD.gn @@ -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",