Import translations. DO NOT MERGE am: 39fa242356 -s ours

am: 2415acb72f  -s ours

* commit '2415acb72f88cf3f9214103ece1eb55eaa4c323b':
  Import translations. DO NOT MERGE

diff --git a/Android.mk b/Android.mk
index 3088512..596b86e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,13 +14,9 @@ LOCAL_RENDERSCRIPT_TARGET_API := 18
 LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
-# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
-prev_compiled_rs_files := $(call all-renderscript-files-under, src)
-
-# We already have these files from GalleryGoogle, so don't install them.
-LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res

diff --git a/proguard.flags b/proguard.flags
index 65104ec..ae83baa 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -84,3 +84,7 @@
 -keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
 -keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
 -keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
+
+
+# TODO: remove or rename android.util.Pools.java from our source.
+-dontwarn android.util.Pools*