Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: base/BUILD.gn

Issue 663543003: Fix low-memory devices crashing on Chrome start up during UMA recodring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed LibraryLoader.onNativeInitializationComplete() with no arguments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 } 9 }
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 "android/jni_registrar.cc", 50 "android/jni_registrar.cc",
51 "android/jni_registrar.h", 51 "android/jni_registrar.h",
52 "android/jni_string.cc", 52 "android/jni_string.cc",
53 "android/jni_string.h", 53 "android/jni_string.h",
54 "android/jni_utils.cc", 54 "android/jni_utils.cc",
55 "android/jni_utils.h", 55 "android/jni_utils.h",
56 "android/jni_weak_ref.cc", 56 "android/jni_weak_ref.cc",
57 "android/jni_weak_ref.h", 57 "android/jni_weak_ref.h",
58 "android/library_loader/library_loader_hooks.cc", 58 "android/library_loader/library_loader_hooks.cc",
59 "android/library_loader/library_loader_hooks.h", 59 "android/library_loader/library_loader_hooks.h",
60 "android/library_loader/library_load_from_apk_status_codes.h",
60 "android/memory_pressure_listener_android.cc", 61 "android/memory_pressure_listener_android.cc",
61 "android/memory_pressure_listener_android.h", 62 "android/memory_pressure_listener_android.h",
62 "android/java_handler_thread.cc", 63 "android/java_handler_thread.cc",
63 "android/java_handler_thread.h", 64 "android/java_handler_thread.h",
64 "android/path_service_android.cc", 65 "android/path_service_android.cc",
65 "android/path_service_android.h", 66 "android/path_service_android.h",
66 "android/path_utils.cc", 67 "android/path_utils.cc",
67 "android/path_utils.h", 68 "android/path_utils.h",
68 "android/sys_utils.cc", 69 "android/sys_utils.cc",
69 "android/sys_utils.h", 70 "android/sys_utils.h",
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 "android/java/src/org/chromium/base/ThreadUtils.java", 1416 "android/java/src/org/chromium/base/ThreadUtils.java",
1416 "android/java/src/org/chromium/base/TraceEvent.java", 1417 "android/java/src/org/chromium/base/TraceEvent.java",
1417 ] 1418 ]
1418 jni_package = "base" 1419 jni_package = "base"
1419 } 1420 }
1420 1421
1421 # GYP: //base.gyp:base_java 1422 # GYP: //base.gyp:base_java
1422 android_library("base_java") { 1423 android_library("base_java") {
1423 srcjar_deps = [ 1424 srcjar_deps = [
1424 ":base_java_application_state", 1425 ":base_java_application_state",
1426 ":base_java_library_load_from_apk_status_codes",
1425 ":base_java_memory_pressure_level_list", 1427 ":base_java_memory_pressure_level_list",
1426 ":base_native_libraries_gen", 1428 ":base_native_libraries_gen",
1427 ] 1429 ]
1428 1430
1429 deps = [ 1431 deps = [
1430 "//third_party/jsr-305:jsr_305_javalib" 1432 "//third_party/jsr-305:jsr_305_javalib"
1431 ] 1433 ]
1432 1434
1433 DEPRECATED_java_in_dir = "android/java/src" 1435 DEPRECATED_java_in_dir = "android/java/src"
1434 1436
1435 # A new version of NativeLibraries.java (with the actual correct values) 1437 # A new version of NativeLibraries.java (with the actual correct values)
1436 # will be created when creating an apk. 1438 # will be created when creating an apk.
1437 jar_excluded_patterns = [ 1439 jar_excluded_patterns = [
1438 "*/NativeLibraries.class", 1440 "*/NativeLibraries.class",
1439 "*/NativeLibraries##*.class", 1441 "*/NativeLibraries##*.class",
1440 ] 1442 ]
1441 } 1443 }
1442 1444
1445 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
1446 java_cpp_template("base_java_library_load_from_apk_status_codes") {
danakj 2014/10/23 15:12:36 can you order this the same as they appear in the
petrcermak 2014/10/23 16:24:57 Done.
1447 sources = [
1448 "android/java/src/org/chromium/base/library_loader/LibraryLoadFromApkStatu sCodes.template",
1449 ]
1450 inputs = [
1451 "android/library_loader/library_load_from_apk_status_codes.h"
1452 ]
1453
1454 package_name = "org/chromium/base/library_loader"
1455 }
1456
1443 # GYP: //base.gyp:base_javatests 1457 # GYP: //base.gyp:base_javatests
1444 android_library("base_javatests") { 1458 android_library("base_javatests") {
1445 deps = [ 1459 deps = [
1446 ":base_java", 1460 ":base_java",
1447 ":base_java_test_support", 1461 ":base_java_test_support",
1448 ] 1462 ]
1449 DEPRECATED_java_in_dir = "android/javatests/src" 1463 DEPRECATED_java_in_dir = "android/javatests/src"
1450 } 1464 }
1451 1465
1452 # GYP: //base.gyp:base_java_test_support 1466 # GYP: //base.gyp:base_java_test_support
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 # GYP: //base.gyp:base_unittests_apk 1514 # GYP: //base.gyp:base_unittests_apk
1501 unittest_apk("base_unittests_apk") { 1515 unittest_apk("base_unittests_apk") {
1502 deps = [ 1516 deps = [
1503 ":base_java", 1517 ":base_java",
1504 ":base_java_unittest_support", 1518 ":base_java_unittest_support",
1505 ":base_unittests", 1519 ":base_unittests",
1506 ] 1520 ]
1507 unittests_dep = ":base_unittests" 1521 unittests_dep = ":base_unittests"
1508 } 1522 }
1509 } 1523 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698