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

Side by Side Diff: build/common.gypi

Issue 1991343002: [Android] Roll the NDK to r11c. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 2 Created 4 years, 6 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 | « DEPS ('k') | build/config/android/BUILD.gn » ('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 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 'android_ndk_root%': '../../third_party/android_tools/ndk/', 1719 'android_ndk_root%': '../../third_party/android_tools/ndk/',
1720 # Unfortunately, it is required to use the absolute path to the SDK 1720 # Unfortunately, it is required to use the absolute path to the SDK
1721 # because it us passed to ant which uses a different relative path 1721 # because it us passed to ant which uses a different relative path
1722 # from GYP. 1722 # from GYP.
1723 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1723 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1724 # Similarly, gdbserver and the Android toolchain need to use the 1724 # Similarly, gdbserver and the Android toolchain need to use the
1725 # absolute path to the NDK because they are used at different levels 1725 # absolute path to the NDK because they are used at different levels
1726 # in the GYP files. 1726 # in the GYP files.
1727 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/', 1727 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party /android_tools/ndk/',
1728 'android_host_arch%': '<!(uname -m)', 1728 'android_host_arch%': '<!(uname -m)',
1729 # Version of the NDK. Used to ensure full rebuilds on NDK rolls.
1730 'android_ndk_version%': 'r11c',
1729 # Android API-level of the SDK used for compilation. 1731 # Android API-level of the SDK used for compilation.
1730 'android_sdk_version%': '23', 1732 'android_sdk_version%': '23',
1731 'android_sdk_build_tools_version%': '23.0.1', 1733 'android_sdk_build_tools_version%': '23.0.1',
1732 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1734 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1733 1735
1734 'conditions': [ 1736 'conditions': [
1735 # Figure this out early since it needs symbols from libgcc.a, so i t 1737 # Figure this out early since it needs symbols from libgcc.a, so i t
1736 # has to be before that in the set of libraries. 1738 # has to be before that in the set of libraries.
1737 # ASan needs to dynamically link to libc++ even in static builds s o 1739 # ASan needs to dynamically link to libc++ even in static builds s o
1738 # that it can interpose operator new. 1740 # that it can interpose operator new.
1739 ['component=="shared_library" or asan==1', { 1741 ['component=="shared_library" or asan==1', {
1740 'android_libcpp_library': 'c++_shared', 1742 'android_libcpp_library': 'c++_shared',
1741 'android_must_copy_system_libraries': 1, 1743 'android_must_copy_system_libraries': 1,
1742 }, { 1744 }, {
1743 'android_libcpp_library': 'c++_static', 1745 'android_libcpp_library': 'c++_static',
1744 'android_must_copy_system_libraries': 0, 1746 'android_must_copy_system_libraries': 0,
1745 }], 1747 }],
1746 ], 1748 ],
1747 1749
1748 }, 1750 },
1749 # Copy conditionally-set variables out one scope. 1751 # Copy conditionally-set variables out one scope.
1750 'android_ndk_root%': '<(android_ndk_root)', 1752 'android_ndk_root%': '<(android_ndk_root)',
1751 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)', 1753 'android_ndk_absolute_root%': '<(android_ndk_absolute_root)',
1754 'android_ndk_version%': '<(android_ndk_version)',
1752 'android_sdk_root%': '<(android_sdk_root)', 1755 'android_sdk_root%': '<(android_sdk_root)',
1753 'android_sdk_version%': '<(android_sdk_version)', 1756 'android_sdk_version%': '<(android_sdk_version)',
1754 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version )', 1757 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version )',
1755 'android_libcpp_root': '<(android_ndk_root)/sources/cxx-stl/llvm-libc+ +', 1758 'android_libcpp_root': '<(android_ndk_root)/sources/cxx-stl/llvm-libc+ +',
1756 'android_libcpp_library': '<(android_libcpp_library)', 1759 'android_libcpp_library': '<(android_libcpp_library)',
1757 'android_must_copy_system_libraries': '<(android_must_copy_system_libr aries)', 1760 'android_must_copy_system_libraries': '<(android_must_copy_system_libr aries)',
1758 'host_os%': '<(host_os)', 1761 'host_os%': '<(host_os)',
1759 1762
1760 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)', 1763 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)',
1761 # Android SDK build tools (e.g. dx, aidl) 1764 # Android SDK build tools (e.g. dx, aidl)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1813 'android_ndk_lib_dir%': 'usr/lib64', 1816 'android_ndk_lib_dir%': 'usr/lib64',
1814 'android_toolchain%': '<(android_ndk_absolute_root)/toolchains/mip s64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1817 'android_toolchain%': '<(android_ndk_absolute_root)/toolchains/mip s64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1815 }], 1818 }],
1816 ], 1819 ],
1817 }, 1820 },
1818 # Copy conditionally-set variables out one scope. 1821 # Copy conditionally-set variables out one scope.
1819 'android_app_abi%': '<(android_app_abi)', 1822 'android_app_abi%': '<(android_app_abi)',
1820 'android_gdbserver%': '<(android_gdbserver)', 1823 'android_gdbserver%': '<(android_gdbserver)',
1821 'android_ndk_root%': '<(android_ndk_root)', 1824 'android_ndk_root%': '<(android_ndk_root)',
1822 'android_ndk_sysroot%': '<(android_ndk_sysroot)', 1825 'android_ndk_sysroot%': '<(android_ndk_sysroot)',
1826 'android_ndk_version%': '<(android_ndk_version)',
1823 'android_sdk_root%': '<(android_sdk_root)', 1827 'android_sdk_root%': '<(android_sdk_root)',
1824 'android_sdk_version%': '<(android_sdk_version)', 1828 'android_sdk_version%': '<(android_sdk_version)',
1825 'android_toolchain%': '<(android_toolchain)', 1829 'android_toolchain%': '<(android_toolchain)',
1826 1830
1827 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 1831 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
1828 'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)', 1832 'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)',
1829 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version)' , 1833 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version)' ,
1830 'android_sdk_tools%': '<(android_sdk_tools)', 1834 'android_sdk_tools%': '<(android_sdk_tools)',
1831 'android_aapt_path%': '<(android_sdk_tools)/aapt', 1835 'android_aapt_path%': '<(android_sdk_tools)/aapt',
1832 'android_sdk%': '<(android_sdk)', 1836 'android_sdk%': '<(android_sdk)',
(...skipping 3029 matching lines...) Expand 10 before | Expand all | Expand 10 after
4862 '-isystem<(android_libcpp_include)', 4866 '-isystem<(android_libcpp_include)',
4863 '-isystem<(android_ndk_root)/sources/cxx-stl/llvm-libc++abi/libcxx abi/include', 4867 '-isystem<(android_ndk_root)/sources/cxx-stl/llvm-libc++abi/libcxx abi/include',
4864 '-isystem<(android_ndk_root)/sources/android/support/include', 4868 '-isystem<(android_ndk_root)/sources/android/support/include',
4865 ], 4869 ],
4866 'defines': [ 4870 'defines': [
4867 'ANDROID', 4871 'ANDROID',
4868 '__GNU_SOURCE=1', # Necessary for clone() 4872 '__GNU_SOURCE=1', # Necessary for clone()
4869 # The NDK has these things, but doesn't define the constants 4873 # The NDK has these things, but doesn't define the constants
4870 # to say that it does. Define them here instead. 4874 # to say that it does. Define them here instead.
4871 'HAVE_SYS_UIO_H', 4875 'HAVE_SYS_UIO_H',
4876 'ANDROID_NDK_VERSION=<(android_ndk_version)',
4872 ], 4877 ],
4873 'ldflags!': [ 4878 'ldflags!': [
4874 '-pthread', # Not supported by Android toolchain. 4879 '-pthread', # Not supported by Android toolchain.
4875 ], 4880 ],
4876 'ldflags': [ 4881 'ldflags': [
4877 '-Wl,--build-id=sha1', 4882 '-Wl,--build-id=sha1',
4878 '-Wl,--no-undefined', 4883 '-Wl,--no-undefined',
4879 '--sysroot=<(android_ndk_sysroot)', 4884 '--sysroot=<(android_ndk_sysroot)',
4880 '-nostdlib', 4885 '-nostdlib',
4881 '-L<(android_libcpp_libs_dir)', 4886 '-L<(android_libcpp_libs_dir)',
(...skipping 1504 matching lines...) Expand 10 before | Expand all | Expand 10 after
6386 # settings in target dicts. SYMROOT is a special case, because many other 6391 # settings in target dicts. SYMROOT is a special case, because many other
6387 # Xcode variables depend on it, including variables such as 6392 # Xcode variables depend on it, including variables such as
6388 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6393 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6389 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6394 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6390 # files to appear (when present) in the UI as actual files and not red 6395 # files to appear (when present) in the UI as actual files and not red
6391 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6396 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6392 # and therefore SYMROOT, needs to be set at the project level. 6397 # and therefore SYMROOT, needs to be set at the project level.
6393 'SYMROOT': '<(DEPTH)/xcodebuild', 6398 'SYMROOT': '<(DEPTH)/xcodebuild',
6394 }, 6399 },
6395 } 6400 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/config/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698