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

Side by Side Diff: build/common.gypi

Issue 671633003: Roll android_tools and breakpad to the latest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 6 years, 2 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/pylib/constants.py ('k') | build/config/android/config.gni » ('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 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 'variables': { 1628 'variables': {
1629 'variables': { 1629 'variables': {
1630 # Unfortunately we have to use absolute paths to the SDK/NDK because 1630 # Unfortunately we have to use absolute paths to the SDK/NDK because
1631 # they're passed to ant which uses a different relative path from 1631 # they're passed to ant which uses a different relative path from
1632 # gyp. 1632 # gyp.
1633 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/', 1633 'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/ndk/',
1634 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/', 1634 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_ tools/sdk/',
1635 'android_host_arch%': '<!(uname -m)', 1635 'android_host_arch%': '<!(uname -m)',
1636 # Android API-level of the SDK used for compilation. 1636 # Android API-level of the SDK used for compilation.
1637 'android_sdk_version%': '21', 1637 'android_sdk_version%': '21',
1638 'android_sdk_build_tools_version%': '21.0.0', 1638 'android_sdk_build_tools_version%': '21.0.1',
1639 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 1639 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
1640 }, 1640 },
1641 # Copy conditionally-set variables out one scope. 1641 # Copy conditionally-set variables out one scope.
1642 'android_ndk_root%': '<(android_ndk_root)', 1642 'android_ndk_root%': '<(android_ndk_root)',
1643 'android_sdk_root%': '<(android_sdk_root)', 1643 'android_sdk_root%': '<(android_sdk_root)',
1644 'android_sdk_version%': '<(android_sdk_version)', 1644 'android_sdk_version%': '<(android_sdk_version)',
1645 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport', 1645 'android_stlport_root': '<(android_ndk_root)/sources/cxx-stl/stlport',
1646 'host_os%': '<(host_os)', 1646 'host_os%': '<(host_os)',
1647 1647
1648 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)', 1648 'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_v ersion)',
1649 # Android SDK build tools (e.g. dx, aapt, aidl) 1649 # Android SDK build tools (e.g. dx, aapt, aidl)
1650 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)', 1650 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)',
1651 1651
1652 # Android API level 14 is ICS (Android 4.0) which is the minimum 1652 # Android API level 14 is ICS (Android 4.0) which is the minimum
1653 # platform requirement for Chrome on Android, we use it for native 1653 # platform requirement for Chrome on Android, we use it for native
1654 # code compilation. 1654 # code compilation.
1655 'conditions': [ 1655 'conditions': [
1656 ['target_arch == "ia32"', { 1656 ['target_arch == "ia32"', {
1657 'android_app_abi%': 'x86', 1657 'android_app_abi%': 'x86',
1658 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', 1658 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver',
1659 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', 1659 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86',
1660 'android_ndk_lib_dir%': 'usr/lib', 1660 'android_ndk_lib_dir%': 'usr/lib',
1661 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb uilt/<(host_os)-<(android_host_arch)/bin', 1661 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb uilt/<(host_os)-<(android_host_arch)/bin',
1662 }], 1662 }],
1663 ['target_arch == "x64"', { 1663 ['target_arch == "x64"', {
1664 'android_app_abi%': 'x86_64', 1664 'android_app_abi%': 'x86_64',
1665 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64 /gdbserver/gdbserver', 1665 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64 /gdbserver/gdbserver',
1666 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/a rch-x86_64', 1666 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/ arch-x86_64',
1667 'android_ndk_lib_dir%': 'usr/lib64', 1667 'android_ndk_lib_dir%': 'usr/lib64',
1668 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p rebuilt/<(host_os)-<(android_host_arch)/bin', 1668 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p rebuilt/<(host_os)-<(android_host_arch)/bin',
1669 }], 1669 }],
1670 ['target_arch=="arm"', { 1670 ['target_arch=="arm"', {
1671 'conditions': [ 1671 'conditions': [
1672 ['arm_version<7', { 1672 ['arm_version<7', {
1673 'android_app_abi%': 'armeabi', 1673 'android_app_abi%': 'armeabi',
1674 }, { 1674 }, {
1675 'android_app_abi%': 'armeabi-v7a', 1675 'android_app_abi%': 'armeabi-v7a',
1676 }], 1676 }],
1677 ], 1677 ],
1678 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', 1678 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver',
1679 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm', 1679 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm',
1680 'android_ndk_lib_dir%': 'usr/lib', 1680 'android_ndk_lib_dir%': 'usr/lib',
1681 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1681 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1682 }], 1682 }],
1683 ['target_arch == "arm64"', { 1683 ['target_arch == "arm64"', {
1684 'android_app_abi%': 'arm64-v8a', 1684 'android_app_abi%': 'arm64-v8a',
1685 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/ gdbserver/gdbserver', 1685 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/ gdbserver/gdbserver',
1686 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/a rch-arm64', 1686 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/ arch-arm64',
1687 'android_ndk_lib_dir%': 'usr/lib', 1687 'android_ndk_lib_dir%': 'usr/lib',
1688 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu x-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1688 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu x-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1689 }], 1689 }],
1690 ['target_arch == "mipsel"', { 1690 ['target_arch == "mipsel"', {
1691 'android_app_abi%': 'mips', 1691 'android_app_abi%': 'mips',
1692 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver', 1692 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver',
1693 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips', 1693 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips',
1694 'android_ndk_lib_dir%': 'usr/lib', 1694 'android_ndk_lib_dir%': 'usr/lib',
1695 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1695 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1696 }], 1696 }],
1697 ['target_arch == "mips64el"', { 1697 ['target_arch == "mips64el"', {
1698 'android_app_abi%': 'mips64', 1698 'android_app_abi%': 'mips64',
1699 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips64 /gdbserver/gdbserver', 1699 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips64 /gdbserver/gdbserver',
1700 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/a rch-mips64', 1700 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/ arch-mips64',
1701 'android_ndk_lib_dir%': 'usr/lib64', 1701 'android_ndk_lib_dir%': 'usr/lib64',
1702 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin ux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1702 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin ux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1703 'gcc_version%': 49, 1703 'gcc_version%': 49,
1704 }], 1704 }],
1705 ], 1705 ],
1706 }, 1706 },
1707 # Copy conditionally-set variables out one scope. 1707 # Copy conditionally-set variables out one scope.
1708 'android_app_abi%': '<(android_app_abi)', 1708 'android_app_abi%': '<(android_app_abi)',
1709 'android_gdbserver%': '<(android_gdbserver)', 1709 'android_gdbserver%': '<(android_gdbserver)',
1710 'android_ndk_root%': '<(android_ndk_root)', 1710 'android_ndk_root%': '<(android_ndk_root)',
(...skipping 4037 matching lines...) Expand 10 before | Expand all | Expand 10 after
5748 # settings in target dicts. SYMROOT is a special case, because many other 5748 # settings in target dicts. SYMROOT is a special case, because many other
5749 # Xcode variables depend on it, including variables such as 5749 # Xcode variables depend on it, including variables such as
5750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5752 # files to appear (when present) in the UI as actual files and not red 5752 # files to appear (when present) in the UI as actual files and not red
5753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5754 # and therefore SYMROOT, needs to be set at the project level. 5754 # and therefore SYMROOT, needs to be set at the project level.
5755 'SYMROOT': '<(DEPTH)/xcodebuild', 5755 'SYMROOT': '<(DEPTH)/xcodebuild',
5756 }, 5756 },
5757 } 5757 }
OLDNEW
« no previous file with comments | « build/android/pylib/constants.py ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698