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

Side by Side Diff: build/common.gypi

Issue 1263713005: Link libc++_shared with asan=1 on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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 | « build/android/strip_native_libraries.gypi ('k') | build/java_apk.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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1705 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1706 # Similarly, gdbserver and the Android toolchain need to use the 1706 # Similarly, gdbserver and the Android toolchain need to use the
1707 # absolute path to the NDK because they are used at different levels 1707 # absolute path to the NDK because they are used at different levels
1708 # in the GYP files. 1708 # in the GYP files.
1709 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/', 1709 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/',
1710 'android_host_arch%': '<!(uname -m)', 1710 'android_host_arch%': '<!(uname -m)',
1711 # Android API-level of the SDK used for compilation. 1711 # Android API-level of the SDK used for compilation.
1712 'android_sdk_version%': '22', 1712 'android_sdk_version%': '22',
1713 'android_sdk_build_tools_version%': '22.0.0', 1713 'android_sdk_build_tools_version%': '22.0.0',
1714 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1714 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1715
1716 'conditions': [
1717 # Figure this out early since it needs symbols from libgcc.a, so i t
1718 # has to be before that in the set of libraries.
1719 ['component=="shared_library" or asan==1', {
Nico 2015/08/03 23:02:25 Add some kind of # ASan needs to dynamically li
eugenis 2015/08/03 23:21:24 Done.
1720 'android_libcpp_library': 'c++_shared',
1721 'android_must_copy_system_libraries': 1,
1722 }, {
1723 'android_libcpp_library': 'c++_static',
1724 'android_must_copy_system_libraries': 0,
1725 }],
1726 ],
1727
1715 }, 1728 },
1716 # Copy conditionally-set variables out one scope. 1729 # Copy conditionally-set variables out one scope.
1717 'android_ndk_root%': '<(android_ndk_root)', 1730 'android_ndk_root%': '<(android_ndk_root)',
1718 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)', 1731 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)',
1719 'android_sdk_root%': '<(android_sdk_root)', 1732 'android_sdk_root%': '<(android_sdk_root)',
1720 'android_sdk_version%': '<(android_sdk_version)', 1733 'android_sdk_version%': '<(android_sdk_version)',
1721 'android_libcpp_root': '<(android_ndk_root)/sources/cxx-stl/llvm-libc+ +', 1734 'android_libcpp_root': '<(android_ndk_root)/sources/cxx-stl/llvm-libc+ +',
1735 'android_libcpp_library': '<(android_libcpp_library)',
1736 'android_must_copy_system_libraries': '<(android_must_copy_system_libr aries)',
1722 'host_os%': '<(host_os)', 1737 'host_os%': '<(host_os)',
1723 1738
1724 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)', 1739 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)',
1725 # Android SDK build tools (e.g. dx, aidl) 1740 # Android SDK build tools (e.g. dx, aidl)
1726 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)', 1741 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)',
1727 1742
1728 # Android API level 16 is JB (Android 4.1) which is the minimum 1743 # Android API level 16 is JB (Android 4.1) which is the minimum
1729 # platform requirement for Chrome on Android, we use it for native 1744 # platform requirement for Chrome on Android, we use it for native
1730 # code compilation. 1745 # code compilation.
1731 'conditions': [ 1746 'conditions': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
1789 'android_toolchain%': '<(android_toolchain)', 1804 'android_toolchain%': '<(android_toolchain)',
1790 1805
1791 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 1806 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
1792 'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)', 1807 'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)',
1793 'android_sdk_tools%': '<(android_sdk_tools)', 1808 'android_sdk_tools%': '<(android_sdk_tools)',
1794 'android_aapt_path%': '<(android_sdk_tools)/aapt', 1809 'android_aapt_path%': '<(android_sdk_tools)/aapt',
1795 'android_sdk%': '<(android_sdk)', 1810 'android_sdk%': '<(android_sdk)',
1796 'android_sdk_jar%': '<(android_sdk)/android.jar', 1811 'android_sdk_jar%': '<(android_sdk)/android.jar',
1797 1812
1798 'android_libcpp_root': '<(android_libcpp_root)', 1813 'android_libcpp_root': '<(android_libcpp_root)',
1814 'android_libcpp_library': '<(android_libcpp_library)',
1799 'android_libcpp_include': '<(android_libcpp_root)/libcxx/include', 1815 'android_libcpp_include': '<(android_libcpp_root)/libcxx/include',
1800 'android_libcpp_libs_dir%': '<(android_libcpp_root)/libs/<(android_app_a bi)', 1816 'android_libcpp_libs_dir%': '<(android_libcpp_root)/libs/<(android_app_a bi)',
1817 'android_must_copy_system_libraries': '<(android_must_copy_system_librar ies)',
1801 'host_os%': '<(host_os)', 1818 'host_os%': '<(host_os)',
1802 1819
1803 # Location of the "objcopy" binary, used by both gyp and scripts. 1820 # Location of the "objcopy" binary, used by both gyp and scripts.
1804 'android_objcopy%' : '<!(/bin/echo -n <(android_toolchain)/*-objcopy)', 1821 'android_objcopy%' : '<!(/bin/echo -n <(android_toolchain)/*-objcopy)',
1805 1822
1806 # Location of the "strip" binary, used by both gyp and scripts. 1823 # Location of the "strip" binary, used by both gyp and scripts.
1807 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)', 1824 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
1808 1825
1809 # Location of the "readelf" binary. 1826 # Location of the "readelf" binary.
1810 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)', 1827 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
(...skipping 2926 matching lines...) Expand 10 before | Expand all | Expand 10 after
4737 ], 4754 ],
4738 }, 4755 },
4739 }], 4756 }],
4740 # Android-specific options; note that most are set above with Linux. 4757 # Android-specific options; note that most are set above with Linux.
4741 ['OS=="android"', { 4758 ['OS=="android"', {
4742 'variables': { 4759 'variables': {
4743 # This is a unique identifier for a given build. It's used for 4760 # This is a unique identifier for a given build. It's used for
4744 # identifying various build artifacts corresponding to a particular 4761 # identifying various build artifacts corresponding to a particular
4745 # build of chrome (e.g. where to find archived symbols). 4762 # build of chrome (e.g. where to find archived symbols).
4746 'chrome_build_id%': '', 4763 'chrome_build_id%': '',
4747 'conditions': [
4748 # Figure this out early since it needs symbols from libgcc.a, so it
4749 # has to be before that in the set of libraries.
4750 ['component=="shared_library"', {
4751 'android_libcpp_library': 'c++_shared',
4752 }, {
4753 'android_libcpp_library': 'c++_static',
4754 }],
4755 ],
4756 4764
4757 # Placing this variable here prevents from forking libvpx, used 4765 # Placing this variable here prevents from forking libvpx, used
4758 # by remoting. Remoting is off, so it needn't built, 4766 # by remoting. Remoting is off, so it needn't built,
4759 # so forking it's deps seems like overkill. 4767 # so forking it's deps seems like overkill.
4760 # But this variable need defined to properly run gyp. 4768 # But this variable need defined to properly run gyp.
4761 # A proper solution is to have an OS==android conditional 4769 # A proper solution is to have an OS==android conditional
4762 # in third_party/libvpx/libvpx.gyp to define it. 4770 # in third_party/libvpx/libvpx.gyp to define it.
4763 'libvpx_path': 'lib/linux/arm', 4771 'libvpx_path': 'lib/linux/arm',
4764 }, 4772 },
4765 'target_defaults': { 4773 'target_defaults': {
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
6283 # settings in target dicts. SYMROOT is a special case, because many other 6291 # settings in target dicts. SYMROOT is a special case, because many other
6284 # Xcode variables depend on it, including variables such as 6292 # Xcode variables depend on it, including variables such as
6285 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6293 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6286 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6294 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6287 # files to appear (when present) in the UI as actual files and not red 6295 # files to appear (when present) in the UI as actual files and not red
6288 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6296 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6289 # and therefore SYMROOT, needs to be set at the project level. 6297 # and therefore SYMROOT, needs to be set at the project level.
6290 'SYMROOT': '<(DEPTH)/xcodebuild', 6298 'SYMROOT': '<(DEPTH)/xcodebuild',
6291 }, 6299 },
6292 } 6300 }
OLDNEW
« no previous file with comments | « build/android/strip_native_libraries.gypi ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698