From 234ad7ee78e6b466757da4b57a5899d0f081affe Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 27 Jan 2023 22:08:21 +0100
Subject: [PATCH] Support Java lambdas in build_without_gradle.sh

Building Java source code using lambdas requires core-lambda-stubs.jar.

Refs #3657 <https://github.com/Genymobile/scrcpy/issues/3657>
---
 server/build_without_gradle.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.sh
index 47e65b6b..6677844c 100755
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -24,6 +24,7 @@ GEN_DIR="$BUILD_DIR/gen"
 SERVER_DIR=$(dirname "$0")
 SERVER_BINARY=scrcpy-server
 ANDROID_JAR="$ANDROID_HOME/platforms/android-$PLATFORM/android.jar"
+LAMBDA_JAR="$BUILD_TOOLS_DIR/core-lambda-stubs.jar"
 
 echo "Platform: android-$PLATFORM"
 echo "Build-tools: $BUILD_TOOLS"
@@ -50,7 +51,9 @@ cd "$SERVER_DIR/src/main/aidl"
 
 echo "Compiling java sources..."
 cd ../java
-javac -bootclasspath "$ANDROID_JAR" -cp "$GEN_DIR" -d "$CLASSES_DIR" \
+javac -bootclasspath "$ANDROID_JAR" \
+    -cp "$LAMBDA_JAR:$GEN_DIR" \
+    -d "$CLASSES_DIR" \
     -source 1.8 -target 1.8 \
     com/genymobile/scrcpy/*.java \
     com/genymobile/scrcpy/wrappers/*.java