From 748753da0d3f16c750180566540980bc82ce750c Mon Sep 17 00:00:00 2001
From: Matt Garnes <matt@cyngn.com>
Date: Mon, 6 Apr 2015 18:25:47 -0700
Subject: Detect text encoding with juniversalchardet.

- When opening files in the built in editor for display, detect the
  encoding with juniversalchardet, so that the correct encoding will be
  used.
- Use byte buffers to back ShellConsole instead of StringBuffers

Change-Id: I85fa567ef589a82f1c8604f1f215647376c31c9a
(cherry picked from commit 55c55835d3bd685dde542b4f5952ce401542ab84)
---
 Android.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index b86ad9c0..a991e6af 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,11 +23,17 @@ LOCAL_SRC_FILES += $(call all-java-files-under, libs/color-picker-view/src)
 
 LOCAL_STATIC_JAVA_LIBRARIES += libtruezip
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += juniversalchardet
 
 LOCAL_PACKAGE_NAME := CMFileManager
 LOCAL_CERTIFICATE := platform
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+    juniversalchardet:libs/juniversalchardet/juniversalchardet-1.0.3.jar
 
+include $(BUILD_MULTI_PREBUILT)
 include $(call all-makefiles-under,$(LOCAL_PATH))
-- 
cgit v1.2.3