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

Side by Side Diff: base/base.gyp

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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 { 1336 {
1337 # GN: //base:base_java 1337 # GN: //base:base_java
1338 'target_name': 'base_java', 1338 'target_name': 'base_java',
1339 'type': 'none', 1339 'type': 'none',
1340 'variables': { 1340 'variables': {
1341 'java_in_dir': '../base/android/java', 1341 'java_in_dir': '../base/android/java',
1342 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1342 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1343 }, 1343 },
1344 'dependencies': [ 1344 'dependencies': [
1345 'base_java_application_state', 1345 'base_java_application_state',
1346 'base_java_library_load_from_apk_status_codes',
1346 'base_java_memory_pressure_level_list', 1347 'base_java_memory_pressure_level_list',
1347 'base_native_libraries_gen', 1348 'base_native_libraries_gen',
1348 ], 1349 ],
1349 'includes': [ '../build/java.gypi' ], 1350 'includes': [ '../build/java.gypi' ],
1350 'conditions': [ 1351 'conditions': [
1351 ['android_webview_build==0', { 1352 ['android_webview_build==0', {
1352 'dependencies': [ 1353 'dependencies': [
1353 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1354 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1354 ], 1355 ],
1355 }] 1356 }]
1356 ], 1357 ],
1357 }, 1358 },
1358 { 1359 {
1360 # GN: //base:base_java_library_load_from_apk_status_codes
danakj 2014/10/23 15:12:36 order the same as the list above
petrcermak 2014/10/23 16:24:57 Done.
1361 'target_name': 'base_java_library_load_from_apk_status_codes',
1362 'type': 'none',
1363 'sources': [
1364 'android/java/src/org/chromium/base/library_loader/LibraryLoadFromAp kStatusCodes.template',
1365 ],
1366 'variables': {
1367 'package_name': 'org/chromium/base/library_loader',
1368 'template_deps': ['android/library_loader/library_load_from_apk_stat us_codes.h'],
1369 },
1370 'includes': [ '../build/android/java_cpp_template.gypi' ],
1371 },
1372 {
1359 # GN: //base:base_java_unittest_support 1373 # GN: //base:base_java_unittest_support
1360 'target_name': 'base_java_unittest_support', 1374 'target_name': 'base_java_unittest_support',
1361 'type': 'none', 1375 'type': 'none',
1362 'dependencies': [ 1376 'dependencies': [
1363 'base_java', 1377 'base_java',
1364 ], 1378 ],
1365 'variables': { 1379 'variables': {
1366 'java_in_dir': '../base/test/android/java', 1380 'java_in_dir': '../base/test/android/java',
1367 }, 1381 },
1368 'includes': [ '../build/java.gypi' ], 1382 'includes': [ '../build/java.gypi' ],
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 'dependencies': [ 1523 'dependencies': [
1510 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1524 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1511 ], 1525 ],
1512 }], 1526 }],
1513 ], 1527 ],
1514 }, 1528 },
1515 ], 1529 ],
1516 }], 1530 }],
1517 ], 1531 ],
1518 } 1532 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698