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

Side by Side Diff: base/base.gypi

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/base.gyp ('k') | no next file » | 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 'includes': [ 6 'includes': [
7 'trace_event/trace_event.gypi', 7 'trace_event/trace_event.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 ['OS == "android" and _toolset == "host" and host_os == "linux"', { 829 ['OS == "android" and _toolset == "host" and host_os == "linux"', {
830 'defines': [ 830 'defines': [
831 'OS_ANDROID_HOST=Linux', 831 'OS_ANDROID_HOST=Linux',
832 ], 832 ],
833 'sources/': [ 833 'sources/': [
834 # Pull in specific files for host builds. 834 # Pull in specific files for host builds.
835 ['include', '^atomicops_internals_x86_gcc\\.cc$'], 835 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
836 ['include', '^threading/platform_thread_linux\\.cc$'], 836 ['include', '^threading/platform_thread_linux\\.cc$'],
837 ], 837 ],
838 }], 838 }],
839 ['OS == "android" and <(android_webview_build)==1', {
840 'defines': [
841 # WebView builds as part of the system which already has sincos;
842 # avoid defining it again as it causes a linker warning.
843 'ANDROID_SINCOS_PROVIDED',
844 ],
845 }],
846 ['<(chromeos) == 1', { 839 ['<(chromeos) == 1', {
847 'sources!': [ 840 'sources!': [
848 'power_monitor/power_monitor_device_source_posix.cc', 841 'power_monitor/power_monitor_device_source_posix.cc',
849 ], 842 ],
850 }], 843 }],
851 ['OS == "ios" and _toolset != "host"', { 844 ['OS == "ios" and _toolset != "host"', {
852 'sources/': [ 845 'sources/': [
853 # Pull in specific Mac files for iOS (which have been filtered out 846 # Pull in specific Mac files for iOS (which have been filtered out
854 # by file name rules). 847 # by file name rules).
855 ['include', '^atomicops_internals_mac\\.'], 848 ['include', '^atomicops_internals_mac\\.'],
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 'i18n/time_formatting.h', 1006 'i18n/time_formatting.h',
1014 'i18n/timezone.cc', 1007 'i18n/timezone.cc',
1015 'i18n/timezone.h', 1008 'i18n/timezone.h',
1016 'i18n/utf8_validator_tables.cc', 1009 'i18n/utf8_validator_tables.cc',
1017 'i18n/utf8_validator_tables.h', 1010 'i18n/utf8_validator_tables.h',
1018 ], 1011 ],
1019 }] 1012 }]
1020 ], 1013 ],
1021 }, 1014 },
1022 } 1015 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698