Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders

src/codec/SkJpegDecoderMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkJpegDecoderMgr.h"
 #include "SkJpegUtility.h"
 
 /*
  * Print information, warning, and error messages
  */
 static void print_message(const j_common_ptr info, const char caller[]) {
     char buffer[JMSG_LENGTH_MAX];
     info->err->format_message(info, buffer);
     SkCodecPrintf("libjpeg error %d <%s> from %s\n", info->err->msg_code, buffer, caller);
 }
 
 /*
  * Reporting functions for libjpeg
  */
 static void emit_message(j_common_ptr info, int) {
     print_message(info, "emit_message");
 }
 static void output_message(j_common_ptr info) {
     print_message(info, "output_message");
 }
 
-/*
- * Choose the size of the memory buffer on Android
- */
-static void overwrite_mem_buffer_size(jpeg_decompress_struct* dinfo) {
-#ifdef SK_BUILD_FOR_ANDROID
-
-// Use 30 MB for devices with a large amount of system memory and 5MB otherwise
-// TODO: (msarett) This matches SkImageDecoder.  Why were these values chosen?
-#ifdef ANDROID_LARGE_MEMORY_DEVICE
-    dinfo->mem->max_memory_to_use = 30 * 1024 * 1024;
-#else
-    dinfo->mem->max_memory_to_use = 5 * 1024 * 1024;
-#endif
-
-#endif // SK_BUILD_FOR_ANDROID
-}
-
 bool JpegDecoderMgr::returnFalse(const char caller[]) {
     print_message((j_common_ptr) &fDInfo, caller);
     return false;
 }
 
 SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Result result) {
     print_message((j_common_ptr) &fDInfo, caller);
     return result;
 }
 
@@ skipping 25 matching lines @@
 {
     // Error manager must be set before any calls to libjeg in order to handle failures
     fDInfo.err = jpeg_std_error(&fErrorMgr);
     fErrorMgr.error_exit = skjpeg_err_exit;
 }
 
 void JpegDecoderMgr::init() {
     jpeg_create_decompress(&fDInfo);
     fInit = true;
     fDInfo.src = &fSrcMgr;
-    overwrite_mem_buffer_size(&fDInfo);
     fDInfo.err->emit_message = &emit_message;
     fDInfo.err->output_message = &output_message;
 }
 
 JpegDecoderMgr::~JpegDecoderMgr() {
     if (fInit) {
         jpeg_destroy_decompress(&fDInfo);
     }
 }
 
 jmp_buf& JpegDecoderMgr::getJmpBuf() {
     return fErrorMgr.fJmpBuf;
 }
 
 jpeg_decompress_struct* JpegDecoderMgr::dinfo() {
     return &fDInfo;
 }