From 750ec6e7e15826ea0d8784dd9c9fc874300c5328 Mon Sep 17 00:00:00 2001 From: Gustav Sennton Date: Wed, 25 Jan 2017 16:30:24 +0000 Subject: [PATCH] Use utf-8 instead of default encoding in build_android_stubs.mk When not explicitly setting the encoding to use for 'javac' it uses some default encoding - this will fail when using ascii as default encoding and compiling files containing utf-8 characters. Bug: 34098662 Test: ran 'make' locally (internal master) for an Angler build. Change-Id: I9dbdabbfa69f04c52e09285d85494e0f0d188518 --- build/build_android_stubs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk index 5d9684dd9..a57fc1b7e 100644 --- a/build/build_android_stubs.mk +++ b/build/build_android_stubs.mk @@ -55,7 +55,7 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(hide) $(ACP) libcore/ojluni/NOTICE $(PRIVATE_CLASS_INTERMEDIATES_DIR)/NOTICES/ojluni-NOTICE $(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \ $(PRIVATE_INTERMEDIATES_DIR)/java-source-list - $(hide) $(TARGET_JAVAC) -source 1.8 -target 1.8 -bootclasspath "" \ + $(hide) $(TARGET_JAVAC) -source 1.8 -target 1.8 -encoding UTF-8 -bootclasspath "" \ -g -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \ || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )