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

Side by Side Diff: base/base.gypi

Issue 22877016: Android WebView: don't define sincos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix variable expansion for target_conditions Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | base/os_compat_android.cc » ('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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 ['include', '^sys_info_linux\\.cc$'], 753 ['include', '^sys_info_linux\\.cc$'],
754 ['include', '^worker_pool_linux\\.cc$'], 754 ['include', '^worker_pool_linux\\.cc$'],
755 ], 755 ],
756 }], 756 }],
757 ['OS == "android" and _toolset == "host" and host_os == "linux"', { 757 ['OS == "android" and _toolset == "host" and host_os == "linux"', {
758 'sources/': [ 758 'sources/': [
759 # Pull in specific files for host builds. 759 # Pull in specific files for host builds.
760 ['include', '^threading/platform_thread_linux\\.cc$'], 760 ['include', '^threading/platform_thread_linux\\.cc$'],
761 ], 761 ],
762 }], 762 }],
763 ['OS == "android" and <(android_webview_build)==1', {
764 'defines': [
765 # WebView builds as part of the system which already has sincos;
766 # avoid defining it again as it causes a linker warning.
767 'ANDROID_SINCOS_PROVIDED',
768 ],
769 }],
763 ['OS == "ios" and _toolset != "host"', { 770 ['OS == "ios" and _toolset != "host"', {
764 'sources/': [ 771 'sources/': [
765 # Pull in specific Mac files for iOS (which have been filtered out 772 # Pull in specific Mac files for iOS (which have been filtered out
766 # by file name rules). 773 # by file name rules).
767 ['include', '^atomicops_internals_mac\\.'], 774 ['include', '^atomicops_internals_mac\\.'],
768 ['include', '^base_paths_mac\\.'], 775 ['include', '^base_paths_mac\\.'],
769 ['include', '^file_util_mac\\.'], 776 ['include', '^file_util_mac\\.'],
770 ['include', '^file_version_info_mac\\.'], 777 ['include', '^file_version_info_mac\\.'],
771 ['include', '^mac/bundle_locations\\.'], 778 ['include', '^mac/bundle_locations\\.'],
772 ['include', '^mac/foundation_util\\.'], 779 ['include', '^mac/foundation_util\\.'],
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', { 895 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
889 'sources/': [ 896 'sources/': [
890 ['exclude', '^third_party/nspr/'], 897 ['exclude', '^third_party/nspr/'],
891 ], 898 ],
892 }], 899 }],
893 ], 900 ],
894 }], 901 }],
895 ], 902 ],
896 }, 903 },
897 } 904 }
OLDNEW
« no previous file with comments | « no previous file | base/os_compat_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698