Skip to content

Commit b7ffd86

Browse files
Fix encoding issues in Android build
- Replaced non-ASCII arrow character in `AndroidScreenshotTask.java` with ASCII "->" to fix compilation error. - Updated `Ports/Android/build.xml` to explicitly use `encoding="UTF-8"` for `javac` tasks. - Updated `.ci/container/Dockerfile` to generate and enforce `en_US.UTF-8` locale in the build container.
1 parent bee0669 commit b7ffd86

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.ci/container/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,13 @@ ENV JDK25_HOME=/usr/lib/jvm/java-25-zulu
112112
RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/zulu8-fx/bin/java 100 && \
113113
update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/zulu8-fx/bin/javac 100
114114

115+
# Set locale to UTF-8
116+
RUN apt-get update && apt-get install -y locales && \
117+
locale-gen en_US.UTF-8 && \
118+
update-locale LANG=en_US.UTF-8
119+
120+
ENV LANG=en_US.UTF-8 \
121+
LANGUAGE=en_US:en \
122+
LC_ALL=en_US.UTF-8
123+
115124
CMD ["/bin/bash"]

Ports/Android/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@
101101
<echo message="Building to javac.classpath = ${javac.classpath}" />
102102
<echo message="build.classes.dir = ${build.classes.dir}" />
103103
<echo message="src.dir = ${src.dir}" />
104-
<javac destdir="build/tmp"
104+
<javac destdir="build/tmp" encoding="UTF-8"
105105
classpath="${javac.classpath}:${build.classes.dir}">
106106
<src path="../../CodenameOne/src" />
107107
</javac>
108108
<delete file="build/tmp/com/codename1/impl/CodenameOneThread.class" />
109-
<javac destdir="build/tmp"
109+
<javac destdir="build/tmp" encoding="UTF-8"
110110
classpath="${javac.classpath}:build/tmp">
111111
<src path="${src.dir}" />
112112
</javac>

Ports/Android/src/com/codename1/impl/android/AndroidScreenshotTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void onPixelCopyFinished(int copyResult) {
7373
new Handler(Looper.getMainLooper())
7474
);
7575
} catch (Throwable t) {
76-
// Any unexpected issue fallback
76+
// Any unexpected issue -> fallback
7777
Log.e(t);
7878
tryFallbackDraw(w, h);
7979
}

0 commit comments

Comments
 (0)