From 82d4ced1600371fa70c2bb8b26db31e44e8bedf2 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Wed, 6 Feb 2013 10:04:55 -0700 Subject: [PATCH] specify UTF-8 encoding to javac This fixes "illegal character" errors when compiling e.g. Misc.java on systems where the default encoding is not UTF-8. --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index af5533815f..e5fd4dd16b 100755 --- a/makefile +++ b/makefile @@ -179,7 +179,7 @@ dlltool = dlltool vg = nice valgrind --num-callers=32 --db-attach=yes --freelist-vol=100000000 vg += --leak-check=full --suppressions=valgrind.supp db = gdb --args -javac = "$(JAVA_HOME)/bin/javac" +javac = "$(JAVA_HOME)/bin/javac" -encoding UTF-8 javah = "$(JAVA_HOME)/bin/javah" jar = "$(JAVA_HOME)/bin/jar" strip = strip @@ -433,7 +433,7 @@ ifeq ($(platform),android) lflags = "-L$(sysroot)/usr/lib" $(common-lflags) -llog target-format = elf use-lto = false - + ifeq ($(arch),arm) cflags += -marm -march=$(android-arm-arch) -ftree-vectorize -ffast-math -mfloat-abi=softfp endif