Merge "Remove hard coding of ascii encoding when compiling SDK stubs"

am: 00bc4acbd9

Change-Id: Ifa4977e4b4c2ecafef766b909f0d47606129ccf8
This commit is contained in:
Paul Duffin
2016-09-08 09:11:00 +00:00
committed by android-build-merger

View File

@@ -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 -encoding ascii -bootclasspath "" \
$(hide) $(TARGET_JAVAC) -source 1.8 -target 1.8 -bootclasspath "" \
-g -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
\@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \
|| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )