From 94ef1e13e0d914ac03a855436118b13c9f80b7d9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Fri, 22 Dec 2023 16:37:13 +0100
Subject: [PATCH] android/include/meson.build: call javac directly, eliminate
 run-javac.sh

---
 android/include/meson.build  |  7 ++++---
 android/include/run-javac.sh | 11 -----------
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100755 android/include/run-javac.sh

diff --git a/android/include/meson.build b/android/include/meson.build
index edcdc8283..2fd13c33c 100644
--- a/android/include/meson.build
+++ b/android/include/meson.build
@@ -9,10 +9,11 @@ bridge_header = custom_target(
     '../app/src/main/java/org/musicpd/Bridge.java',
   ],
   command: [
-    join_paths(meson.current_source_dir(), 'run-javac.sh'),
     javac,
-    join_paths(android_sdk_platform_dir, 'android.jar'),
-    '@OUTDIR@',
+    '-source', '1.8', '-target', '1.8',
+    '-Xlint:-options',
+    '-cp', join_paths(android_sdk_platform_dir, 'android.jar'),
+    '-h', '@OUTDIR@',
     '@INPUT@',
   ],
 )
diff --git a/android/include/run-javac.sh b/android/include/run-javac.sh
deleted file mode 100755
index 22daf0c9d..000000000
--- a/android/include/run-javac.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-JAVAC=$1
-CLASSPATH=$2
-GENINCLUDE=$3
-
-"$JAVAC" -source 1.8 -target 1.8 -Xlint:-options \
-	 -cp "$CLASSPATH" \
-	 -h "$GENINCLUDE"  \
-	 "$4"
-