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

Side by Side Diff: base/base.gyp

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix final nits Created 6 years, 10 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 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 { 1251 {
1252 'target_name': 'base_jni_headers', 1252 'target_name': 'base_jni_headers',
1253 'type': 'none', 1253 'type': 'none',
1254 'sources': [ 1254 'sources': [
1255 'android/java/src/org/chromium/base/ActivityStatus.java', 1255 'android/java/src/org/chromium/base/ActivityStatus.java',
1256 'android/java/src/org/chromium/base/BuildInfo.java', 1256 'android/java/src/org/chromium/base/BuildInfo.java',
1257 'android/java/src/org/chromium/base/CommandLine.java', 1257 'android/java/src/org/chromium/base/CommandLine.java',
1258 'android/java/src/org/chromium/base/ContentUriUtils.java', 1258 'android/java/src/org/chromium/base/ContentUriUtils.java',
1259 'android/java/src/org/chromium/base/CpuFeatures.java', 1259 'android/java/src/org/chromium/base/CpuFeatures.java',
1260 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' , 1260 'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java' ,
1261 'android/java/src/org/chromium/base/library_loader/LibraryLoader.jav a',
1261 'android/java/src/org/chromium/base/MemoryPressureListener.java', 1262 'android/java/src/org/chromium/base/MemoryPressureListener.java',
1262 'android/java/src/org/chromium/base/JavaHandlerThread.java', 1263 'android/java/src/org/chromium/base/JavaHandlerThread.java',
1263 'android/java/src/org/chromium/base/PathService.java', 1264 'android/java/src/org/chromium/base/PathService.java',
1264 'android/java/src/org/chromium/base/PathUtils.java', 1265 'android/java/src/org/chromium/base/PathUtils.java',
1265 'android/java/src/org/chromium/base/PowerMonitor.java', 1266 'android/java/src/org/chromium/base/PowerMonitor.java',
1266 'android/java/src/org/chromium/base/SystemMessageHandler.java', 1267 'android/java/src/org/chromium/base/SystemMessageHandler.java',
1267 'android/java/src/org/chromium/base/SysUtils.java', 1268 'android/java/src/org/chromium/base/SysUtils.java',
1268 'android/java/src/org/chromium/base/ThreadUtils.java', 1269 'android/java/src/org/chromium/base/ThreadUtils.java',
1269 'android/java/src/org/chromium/base/TraceEvent.java', 1270 'android/java/src/org/chromium/base/TraceEvent.java',
1270 ], 1271 ],
1271 'variables': { 1272 'variables': {
1272 'jni_gen_package': 'base', 1273 'jni_gen_package': 'base',
1273 'jni_generator_ptr_type': 'long', 1274 'jni_generator_ptr_type': 'long',
1274 }, 1275 },
1275 'includes': [ '../build/jni_generator.gypi' ], 1276 'includes': [ '../build/jni_generator.gypi' ],
1276 }, 1277 },
1277 { 1278 {
1278 'target_name': 'base_unittests_jni_headers', 1279 'target_name': 'base_unittests_jni_headers',
1279 'type': 'none', 1280 'type': 'none',
1280 'sources': [ 1281 'sources': [
1281 'test/android/java/src/org/chromium/base/ContentUriTestUtils.java', 1282 'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
1282 ], 1283 ],
1283 'variables': { 1284 'variables': {
1284 'jni_gen_package': 'base', 1285 'jni_gen_package': 'base',
1285 'jni_generator_ptr_type': 'long', 1286 'jni_generator_ptr_type': 'long',
1286 }, 1287 },
1287 'includes': [ '../build/jni_generator.gypi' ], 1288 'includes': [ '../build/jni_generator.gypi' ],
1288 }, 1289 },
1289 { 1290 {
1291 'target_name': 'base_native_libraries_gen',
1292 'type': 'none',
1293 'sources': [
1294 'android/java/templates/NativeLibraries.template',
1295 ],
1296 'variables': {
1297 'package_name': 'org/chromium/base/library_loader',
1298 'include_path': 'android/java/templates',
1299 'template_deps': [
1300 'android/java/templates/native_libraries_array.h'
1301 ],
1302 },
1303 'includes': [ '../build/android/java_cpp_template.gypi' ],
1304 },
1305 {
1290 'target_name': 'base_java', 1306 'target_name': 'base_java',
1291 'type': 'none', 1307 'type': 'none',
1292 'variables': { 1308 'variables': {
1293 'java_in_dir': '../base/android/java', 1309 'java_in_dir': '../base/android/java',
1310 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1294 }, 1311 },
1295 'dependencies': [ 1312 'dependencies': [
1296 'base_java_activity_state', 1313 'base_java_activity_state',
1297 'base_java_memory_pressure_level_list', 1314 'base_java_memory_pressure_level_list',
1315 'base_native_libraries_gen',
1298 ], 1316 ],
1299 'includes': [ '../build/java.gypi' ], 1317 'includes': [ '../build/java.gypi' ],
1300 'conditions': [ 1318 'conditions': [
1301 ['android_webview_build==0', { 1319 ['android_webview_build==0', {
1302 'dependencies': [ 1320 'dependencies': [
1303 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1321 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1304 ], 1322 ],
1305 }] 1323 }]
1306 ], 1324 ],
1307 }, 1325 },
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 'type': 'none', 1378 'type': 'none',
1361 'dependencies': [ 1379 'dependencies': [
1362 'base_java', 1380 'base_java',
1363 'base_java_test_support', 1381 'base_java_test_support',
1364 ], 1382 ],
1365 'variables': { 1383 'variables': {
1366 'java_in_dir': '../base/android/javatests', 1384 'java_in_dir': '../base/android/javatests',
1367 }, 1385 },
1368 'includes': [ '../build/java.gypi' ], 1386 'includes': [ '../build/java.gypi' ],
1369 }, 1387 },
1388 {
1389 'target_name': 'chromium_android_linker',
1390 'type': 'shared_library',
1391 'conditions': [
1392 ['android_webview_build == 0', {
1393 # Avoid breaking the webview build because it doesn't have
1394 # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses
1395 # the linker anyway.
1396 'sources': [
1397 'android/linker/linker_jni.cc',
1398 ],
1399 'dependencies': [
1400 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
1401 ],
1402 }],
1403 ],
1404 },
1405
1370 ], 1406 ],
1371 }], 1407 }],
1372 ['OS == "win"', { 1408 ['OS == "win"', {
1373 'targets': [ 1409 'targets': [
1374 { 1410 {
1375 'target_name': 'debug_message', 1411 'target_name': 'debug_message',
1376 'type': 'executable', 1412 'type': 'executable',
1377 'sources': [ 1413 'sources': [
1378 'debug_message.cc', 1414 'debug_message.cc',
1379 ], 1415 ],
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 'base_unittests.isolate', 1457 'base_unittests.isolate',
1422 ], 1458 ],
1423 'sources': [ 1459 'sources': [
1424 'base_unittests.isolate', 1460 'base_unittests.isolate',
1425 ], 1461 ],
1426 }, 1462 },
1427 ], 1463 ],
1428 }], 1464 }],
1429 ], 1465 ],
1430 } 1466 }
OLDNEW
« no previous file with comments | « base/android/linker/linker_jni.cc ('k') | base/base.gypi » ('j') | base/base.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698