From 0bd90a9c739e2989ec4b597aec6a3b566d5f5f0a Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 20 Apr 2023 21:01:39 +0000 Subject: [PATCH 1/2] Add change to .bazelrc to build for Java 8 on Android --- .bazelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.bazelrc b/.bazelrc index 4cafc5174..46a4ef076 100644 --- a/.bazelrc +++ b/.bazelrc @@ -43,6 +43,7 @@ build --experimental_java_classpath=bazel build:android_arm --incompatible_enable_android_toolchain_resolution build:android_arm --android_platforms=//:android_arm64 build:android_arm --copt=-D_ANDROID +build:android_arm --java_runtime_version=8 # Windows # Only compiles with clang on Windows. From ee1995e93028468a246844b064e75fb905b9cc75 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 20 Apr 2023 22:18:48 +0000 Subject: [PATCH 2/2] Fix launcher for android due to toolchain error --- launcher/jvm_tooling.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/launcher/jvm_tooling.cpp b/launcher/jvm_tooling.cpp index d93b32311..1b0e50009 100644 --- a/launcher/jvm_tooling.cpp +++ b/launcher/jvm_tooling.cpp @@ -67,6 +67,8 @@ std::string getExecutablePath() { if (_NSGetExecutablePath(buf, &buf_size) != 0) { #elif defined(_WIN32) if (GetModuleFileNameA(NULL, buf, sizeof(buf)) == 0) { +#elif defined(_ANDROID) + if (true) { #else // Assume Linux if (readlink("/proc/self/exe", buf, sizeof(buf)) == -1) { #endif