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

Side by Side Diff: build/common.gypi

Issue 358183002: [Android]: Roll android_tools to update ndk_experimental to r10-rc3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « DEPS ('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 # 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 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 ['target_arch == "ia32"', { 1641 ['target_arch == "ia32"', {
1642 'android_app_abi%': 'x86', 1642 'android_app_abi%': 'x86',
1643 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', 1643 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver',
1644 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', 1644 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86',
1645 'android_ndk_lib_dir%': 'usr/lib', 1645 'android_ndk_lib_dir%': 'usr/lib',
1646 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.8/preb uilt/<(host_os)-<(android_host_arch)/bin', 1646 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.8/preb uilt/<(host_os)-<(android_host_arch)/bin',
1647 }], 1647 }],
1648 ['target_arch == "x64"', { 1648 ['target_arch == "x64"', {
1649 'android_app_abi%': 'x86_64', 1649 'android_app_abi%': 'x86_64',
1650 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-x86_64/gdbserver/gdbserver', 1650 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-x86_64/gdbserver/gdbserver',
1651 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-x86_64', 1651 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-L/arch-x86_64',
1652 'android_ndk_lib_dir%': 'usr/lib64', 1652 'android_ndk_lib_dir%': 'usr/lib64',
1653 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin', 1653 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1654 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport', 1654 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport',
1655 }], 1655 }],
1656 ['target_arch=="arm"', { 1656 ['target_arch=="arm"', {
1657 'conditions': [ 1657 'conditions': [
1658 ['arm_version<7', { 1658 ['arm_version<7', {
1659 'android_app_abi%': 'armeabi', 1659 'android_app_abi%': 'armeabi',
1660 }, { 1660 }, {
1661 'android_app_abi%': 'armeabi-v7a', 1661 'android_app_abi%': 'armeabi-v7a',
1662 }], 1662 }],
1663 ], 1663 ],
1664 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', 1664 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver',
1665 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm', 1665 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm',
1666 'android_ndk_lib_dir%': 'usr/lib', 1666 'android_ndk_lib_dir%': 'usr/lib',
1667 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin', 1667 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
1668 }], 1668 }],
1669 ['target_arch == "arm64"', { 1669 ['target_arch == "arm64"', {
1670 'android_app_abi%': 'arm64-v8a', 1670 'android_app_abi%': 'arm64-v8a',
1671 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-arm64/gdbserver/gdbserver', 1671 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-arm64/gdbserver/gdbserver',
1672 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-arm64', 1672 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-L/arch-arm64',
1673 'android_ndk_lib_dir%': 'usr/lib', 1673 'android_ndk_lib_dir%': 'usr/lib',
1674 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1674 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1675 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport', 1675 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport',
1676 }], 1676 }],
1677 ['target_arch == "mipsel"', { 1677 ['target_arch == "mipsel"', {
1678 'android_app_abi%': 'mips', 1678 'android_app_abi%': 'mips',
1679 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver', 1679 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver',
1680 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips', 1680 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips',
1681 'android_ndk_lib_dir%': 'usr/lib', 1681 'android_ndk_lib_dir%': 'usr/lib',
1682 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin', 1682 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
(...skipping 3864 matching lines...) Expand 10 before | Expand all | Expand 10 after
5547 # settings in target dicts. SYMROOT is a special case, because many other 5547 # settings in target dicts. SYMROOT is a special case, because many other
5548 # Xcode variables depend on it, including variables such as 5548 # Xcode variables depend on it, including variables such as
5549 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5549 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5550 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5550 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5551 # files to appear (when present) in the UI as actual files and not red 5551 # files to appear (when present) in the UI as actual files and not red
5552 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5552 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5553 # and therefore SYMROOT, needs to be set at the project level. 5553 # and therefore SYMROOT, needs to be set at the project level.
5554 'SYMROOT': '<(DEPTH)/xcodebuild', 5554 'SYMROOT': '<(DEPTH)/xcodebuild',
5555 }, 5555 },
5556 } 5556 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698