aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-04-06 18:25:47 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-04-10 22:31:57 +0000
commit748753da0d3f16c750180566540980bc82ce750c (patch)
tree19220b6c9e392443296fbefd3d9fba0eb141fbc5 /Android.mk
parent3650ca2b315f16f1b66d59bdf836a446a97343df (diff)
downloadandroid_packages_apps_CMFileManager-748753da0d3f16c750180566540980bc82ce750c.tar.gz
android_packages_apps_CMFileManager-748753da0d3f16c750180566540980bc82ce750c.tar.bz2
android_packages_apps_CMFileManager-748753da0d3f16c750180566540980bc82ce750c.zip
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)
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
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))