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

Side by Side Diff: base/base.gyp

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « base/android/library_loader/library_loader_hooks.cc ('k') | base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 { 1337 {
1338 # GN: //base:base_java 1338 # GN: //base:base_java
1339 'target_name': 'base_java', 1339 'target_name': 'base_java',
1340 'type': 'none', 1340 'type': 'none',
1341 'variables': { 1341 'variables': {
1342 'java_in_dir': '../base/android/java', 1342 'java_in_dir': '../base/android/java',
1343 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1343 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1344 }, 1344 },
1345 'dependencies': [ 1345 'dependencies': [
1346 'base_java_application_state', 1346 'base_java_application_state',
1347 'base_java_library_load_from_apk_status_codes',
1347 'base_java_memory_pressure_level', 1348 'base_java_memory_pressure_level',
1348 'base_native_libraries_gen', 1349 'base_native_libraries_gen',
1349 ], 1350 ],
1350 'includes': [ '../build/java.gypi' ], 1351 'includes': [ '../build/java.gypi' ],
1351 'conditions': [ 1352 'conditions': [
1352 ['android_webview_build==0', { 1353 ['android_webview_build==0', {
1353 'dependencies': [ 1354 'dependencies': [
1354 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1355 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1355 ], 1356 ],
1356 }] 1357 }]
(...skipping 15 matching lines...) Expand all
1372 # GN: //base:base_android_java_enums_srcjar 1373 # GN: //base:base_android_java_enums_srcjar
1373 'target_name': 'base_java_application_state', 1374 'target_name': 'base_java_application_state',
1374 'type': 'none', 1375 'type': 'none',
1375 'variables': { 1376 'variables': {
1376 'source_file': 'android/application_status_listener.h', 1377 'source_file': 'android/application_status_listener.h',
1377 }, 1378 },
1378 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1379 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1379 }, 1380 },
1380 { 1381 {
1381 # GN: //base:base_android_java_enums_srcjar 1382 # GN: //base:base_android_java_enums_srcjar
1383 'target_name': 'base_java_library_load_from_apk_status_codes',
1384 'toolsets': ['host', 'target'],
1385 'type': 'none',
1386 'variables': {
1387 'source_file': 'android/library_loader/library_load_from_apk_status_ codes.h'
1388 },
1389 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1390 },
1391 {
1392 # GN: //base:base_android_java_enums_srcjar
1382 'target_name': 'base_java_memory_pressure_level', 1393 'target_name': 'base_java_memory_pressure_level',
1383 'type': 'none', 1394 'type': 'none',
1384 'variables': { 1395 'variables': {
1385 'source_file': 'memory/memory_pressure_listener.h', 1396 'source_file': 'memory/memory_pressure_listener.h',
1386 }, 1397 },
1387 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1398 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1388 }, 1399 },
1389 { 1400 {
1390 # GN: //base:base_java_test_support 1401 # GN: //base:base_java_test_support
1391 'target_name': 'base_java_test_support', 1402 'target_name': 'base_java_test_support',
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 'dependencies': [ 1509 'dependencies': [
1499 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1510 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1500 ], 1511 ],
1501 }], 1512 }],
1502 ], 1513 ],
1503 }, 1514 },
1504 ], 1515 ],
1505 }], 1516 }],
1506 ], 1517 ],
1507 } 1518 }
OLDNEW
« no previous file with comments | « base/android/library_loader/library_loader_hooks.cc ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698