Fix low-memory devices crashing on Chrome start up during UMA recodring

base/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 37 matching lines @@
     "android/jni_registrar.cc",
     "android/jni_registrar.h",
     "android/jni_string.cc",
     "android/jni_string.h",
     "android/jni_utils.cc",
     "android/jni_utils.h",
     "android/jni_weak_ref.cc",
     "android/jni_weak_ref.h",
     "android/library_loader/library_loader_hooks.cc",
     "android/library_loader/library_loader_hooks.h",
+    "android/library_loader/library_load_from_apk_support_code.h",

[rmcilroy, 2014/10/20 10:42:39]

"support_code" sounds like it is code to add support for loading from the
library.  How about "library_load_from_apk_status_codes.h" (with a similar
rename for the Java)? 

[petrcermak, 2014/10/20 15:33:22]

Done. I changed the histogram too.

     "android/memory_pressure_listener_android.cc",
     "android/memory_pressure_listener_android.h",
     "android/java_handler_thread.cc",
     "android/java_handler_thread.h",
     "android/path_service_android.cc",
     "android/path_service_android.h",
     "android/path_utils.cc",
     "android/path_utils.h",
     "android/sys_utils.cc",
     "android/sys_utils.h",
@@ skipping 1338 matching lines @@
       "android/java/src/org/chromium/base/ThreadUtils.java",
       "android/java/src/org/chromium/base/TraceEvent.java",
     ]
     jni_package = "base"
   }
 
   # GYP: //base.gyp:base_java
   android_library("base_java") {
     srcjar_deps = [
       ":base_java_application_state",
+      ":base_java_library_load_from_apk_support_code",
       ":base_java_memory_pressure_level_list",
       ":base_native_libraries_gen",
     ]
 
     deps = [
       "//third_party/jsr-305:jsr_305_javalib"
     ]
 
     DEPRECATED_java_in_dir = "android/java/src"
 
     # A new version of NativeLibraries.java (with the actual correct values)
     # will be created when creating an apk.
     jar_excluded_patterns = [
       "*/NativeLibraries.class",
       "*/NativeLibraries##*.class",
     ]
   }
 
+  # GYP: //base.gyp:base_java_library_load_from_apk_support_code
+  java_cpp_template("base_java_library_load_from_apk_support_code") {
+    sources = [
+      "android/java/src/org/chromium/base/library_loader/LibraryLoadFromApkSupportCode.template",

[rmcilroy, 2014/10/20 10:42:39]

I think you've forgotten to upload this file ;).

[petrcermak, 2014/10/20 15:33:22]

Done (I'd forgotten the file below as well).

+    ]
+    inputs = [
+      "android/library_loader/library_load_from_apk_support_code.h"
+    ]
+
+    package_name = "org/chromium/base/library_loader"
+  }
+
   # GYP: //base.gyp:base_javatests
   android_library("base_javatests") {
     deps = [
       ":base_java",
       ":base_java_test_support",
     ]
     DEPRECATED_java_in_dir = "android/javatests/src"
   }
 
   # GYP: //base.gyp:base_java_test_support
@@ skipping 47 matching lines @@
   # GYP: //base.gyp:base_unittests_apk
   unittest_apk("base_unittests_apk") {
     deps = [
       ":base_java",
       ":base_java_unittest_support",
       ":base_unittests",
     ]
     unittests_dep = ":base_unittests"
   }
 }