Index: src/images/SkImageDecoder_libjpeg.cpp |
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp |
index d5303ec434e674318f37c8b852cf863f9745ff41..d2123f349d6344529434861366a7fe4c27c7b1ad 100644 |
--- a/src/images/SkImageDecoder_libjpeg.cpp |
+++ b/src/images/SkImageDecoder_libjpeg.cpp |
@@ -59,14 +59,8 @@ SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderErrors, |
static void overwrite_mem_buffer_size(jpeg_decompress_struct* cinfo) { |
#ifdef SK_BUILD_FOR_ANDROID |
- /* Check if the device indicates that it has a large amount of system memory |
- * if so, increase the memory allocation to 30MB instead of the default 5MB. |
- */ |
-#ifdef ANDROID_LARGE_MEMORY_DEVICE |
+ // We can use a large chunk of memory on all currently supported Android devices |
cinfo->mem->max_memory_to_use = 30 * 1024 * 1024; |
-#else |
- cinfo->mem->max_memory_to_use = 5 * 1024 * 1024; |
-#endif |
#endif // SK_BUILD_FOR_ANDROID |
} |