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

Side by Side Diff: base/base.gyp

Issue 1010653003: Remove android_webview_build conditions from base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « base/android/linker/BUILD.gn ('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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 ['include', '^atomicops_internals_x86_gcc\\.cc$'], 96 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
97 ], 97 ],
98 }], 98 }],
99 ['target_arch == "mipsel"', { 99 ['target_arch == "mipsel"', {
100 'sources/': [ 100 'sources/': [
101 ['include', '^atomicops_internals_mips_gcc\\.cc$'], 101 ['include', '^atomicops_internals_mips_gcc\\.cc$'],
102 ], 102 ],
103 }], 103 }],
104 ], 104 ],
105 'dependencies': [ 105 'dependencies': [
106 'base_java',
106 'base_jni_headers', 107 'base_jni_headers',
107 '../third_party/ashmem/ashmem.gyp:ashmem', 108 '../third_party/ashmem/ashmem.gyp:ashmem',
108 ], 109 ],
109 'link_settings': { 110 'link_settings': {
110 'libraries': [ 111 'libraries': [
111 '-llog', 112 '-llog',
112 ], 113 ],
113 }, 114 },
114 'sources!': [ 115 'sources!': [
115 'debug/stack_trace_posix.cc', 116 'debug/stack_trace_posix.cc',
116 ], 117 ],
117 'includes': [ 118 'includes': [
118 '../build/android/cpufeatures.gypi', 119 '../build/android/cpufeatures.gypi',
119 ], 120 ],
120 }], 121 }],
121 ['OS == "android" and _toolset == "target" and android_webview_build == 0', {
122 'dependencies': [
123 'base_java',
124 ],
125 }],
126 ['os_bsd==1', { 122 ['os_bsd==1', {
127 'include_dirs': [ 123 'include_dirs': [
128 '/usr/local/include', 124 '/usr/local/include',
129 ], 125 ],
130 'link_settings': { 126 'link_settings': {
131 'libraries': [ 127 'libraries': [
132 '-L/usr/local/lib -lexecinfo', 128 '-L/usr/local/lib -lexecinfo',
133 ], 129 ],
134 }, 130 },
135 }], 131 }],
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 'variables': { 1401 'variables': {
1406 'java_in_dir': '../base/android/java', 1402 'java_in_dir': '../base/android/java',
1407 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 1403 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
1408 }, 1404 },
1409 'dependencies': [ 1405 'dependencies': [
1410 'base_java_application_state', 1406 'base_java_application_state',
1411 'base_java_library_load_from_apk_status_codes', 1407 'base_java_library_load_from_apk_status_codes',
1412 'base_java_library_process_type', 1408 'base_java_library_process_type',
1413 'base_java_memory_pressure_level', 1409 'base_java_memory_pressure_level',
1414 'base_native_libraries_gen', 1410 'base_native_libraries_gen',
1411 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1415 ], 1412 ],
1416 'includes': [ '../build/java.gypi' ], 1413 'includes': [ '../build/java.gypi' ],
1417 'conditions': [
1418 ['android_webview_build==0', {
1419 'dependencies': [
1420 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1421 ],
1422 }]
1423 ],
1424 }, 1414 },
1425 { 1415 {
1426 # GN: //base:base_java_unittest_support 1416 # GN: //base:base_java_unittest_support
1427 'target_name': 'base_java_unittest_support', 1417 'target_name': 'base_java_unittest_support',
1428 'type': 'none', 1418 'type': 'none',
1429 'dependencies': [ 1419 'dependencies': [
1430 'base_java', 1420 'base_java',
1431 ], 1421 ],
1432 'variables': { 1422 'variables': {
1433 'java_in_dir': '../base/test/android/java', 1423 'java_in_dir': '../base/test/android/java',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 ], 1473 ],
1484 'variables': { 1474 'variables': {
1485 'java_in_dir': '../base/android/javatests', 1475 'java_in_dir': '../base/android/javatests',
1486 }, 1476 },
1487 'includes': [ '../build/java.gypi' ], 1477 'includes': [ '../build/java.gypi' ],
1488 }, 1478 },
1489 { 1479 {
1490 # GN: //base/android/linker:chromium_android_linker 1480 # GN: //base/android/linker:chromium_android_linker
1491 'target_name': 'chromium_android_linker', 1481 'target_name': 'chromium_android_linker',
1492 'type': 'shared_library', 1482 'type': 'shared_library',
1493 'conditions': [ 1483 'sources': [
1494 # Avoid breaking the webview build because it 1484 'android/linker/linker_jni.cc',
1495 # does not have <(android_ndk_root)/crazy_linker.gyp. 1485 ],
1496 # Note that webview never uses the linker anyway. 1486 # The crazy linker is never instrumented.
1497 ['android_webview_build == 0', { 1487 'cflags!': [
1498 'sources': [ 1488 '-finstrument-functions',
1499 'android/linker/linker_jni.cc', 1489 ],
1500 ], 1490 'dependencies': [
1501 # The crazy linker is never instrumented. 1491 # The NDK contains the crazy_linker here:
1502 'cflags!': [ 1492 # '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
1503 '-finstrument-functions', 1493 # However, we use our own fork. See bug 384700.
1504 ], 1494 '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker',
1505 'dependencies': [
1506 # The NDK contains the crazy_linker here:
1507 # '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
1508 # However, we use our own fork. See bug 384700.
1509 '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_link er',
1510 ],
1511 }],
1512 ], 1495 ],
1513 }, 1496 },
1514 { 1497 {
1515 # TODO(GN) 1498 # TODO(GN)
1516 'target_name': 'base_perftests_apk', 1499 'target_name': 'base_perftests_apk',
1517 'type': 'none', 1500 'type': 'none',
1518 'dependencies': [ 1501 'dependencies': [
1519 'base_perftests', 1502 'base_perftests',
1520 ], 1503 ],
1521 'variables': { 1504 'variables': {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 'dependencies': [ 1578 'dependencies': [
1596 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1579 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1597 ], 1580 ],
1598 }], 1581 }],
1599 ], 1582 ],
1600 }, 1583 },
1601 ], 1584 ],
1602 }], 1585 }],
1603 ], 1586 ],
1604 } 1587 }
OLDNEW
« no previous file with comments | « base/android/linker/BUILD.gn ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698