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

Side by Side Diff: build/common.gypi

Issue 256803008: For x64 set android_ndk_lib to /usr/lib64. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update for Ross' comments Created 6 years, 7 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 | 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 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1514 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)', 1514 'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_b uild_tools_version)',
1515 1515
1516 # Android API level 14 is ICS (Android 4.0) which is the minimum 1516 # Android API level 14 is ICS (Android 4.0) which is the minimum
1517 # platform requirement for Chrome on Android, we use it for native 1517 # platform requirement for Chrome on Android, we use it for native
1518 # code compilation. 1518 # code compilation.
1519 'conditions': [ 1519 'conditions': [
1520 ['target_arch == "ia32"', { 1520 ['target_arch == "ia32"', {
1521 'android_app_abi%': 'x86', 1521 'android_app_abi%': 'x86',
1522 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', 1522 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver',
1523 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', 1523 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86',
1524 'android_ndk_lib_dir': '/usr/lib',
1524 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin', 1525 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin',
1525 }], 1526 }],
1526 ['target_arch == "x64"', { 1527 ['target_arch == "x64"', {
1527 'android_app_abi%': 'x86_64', 1528 'android_app_abi%': 'x86_64',
1528 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-x86_64/gdbserver/gdbserver', 1529 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-x86_64/gdbserver/gdbserver',
1529 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-x86_64', 1530 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-x86_64',
1531 'android_ndk_lib_dir%': '/usr/lib64',
1530 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin', 1532 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',
1531 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport', 1533 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport',
1532 }], 1534 }],
1533 ['target_arch=="arm"', { 1535 ['target_arch=="arm"', {
1534 'conditions': [ 1536 'conditions': [
1535 ['arm_version<7', { 1537 ['arm_version<7', {
1536 'android_app_abi%': 'armeabi', 1538 'android_app_abi%': 'armeabi',
1537 }, { 1539 }, {
1538 'android_app_abi%': 'armeabi-v7a', 1540 'android_app_abi%': 'armeabi-v7a',
1539 }], 1541 }],
1540 ], 1542 ],
1541 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', 1543 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver',
1542 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm', 1544 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm',
1545 'android_ndk_lib_dir': '/usr/lib',
1543 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', 1546 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
1544 }], 1547 }],
1545 ['target_arch == "arm64"', { 1548 ['target_arch == "arm64"', {
1546 'android_app_abi%': 'arm64-v8a', 1549 'android_app_abi%': 'arm64-v8a',
1547 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-arm64/gdbserver/gdbserver', 1550 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/a ndroid-arm64/gdbserver/gdbserver',
1548 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-arm64', 1551 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platform s/android-20/arch-arm64',
1552 'android_ndk_lib_dir': '/usr/lib',
1549 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 1553 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains /aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
1550 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport', 1554 'android_stlport_root': '<(android_ndk_experimental_root)/sources/ cxx-stl/stlport',
1551 }], 1555 }],
1552 ['target_arch == "mipsel"', { 1556 ['target_arch == "mipsel"', {
1553 'android_app_abi%': 'mips', 1557 'android_app_abi%': 'mips',
1554 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver', 1558 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver',
1555 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips', 1559 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips',
1560 'android_ndk_lib_dir': '/usr/lib',
1556 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', 1561 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',
1557 }], 1562 }],
1558 ], 1563 ],
1559 }, 1564 },
1560 # Copy conditionally-set variables out one scope. 1565 # Copy conditionally-set variables out one scope.
1561 'android_app_abi%': '<(android_app_abi)', 1566 'android_app_abi%': '<(android_app_abi)',
1562 'android_gdbserver%': '<(android_gdbserver)', 1567 'android_gdbserver%': '<(android_gdbserver)',
1563 'android_ndk_root%': '<(android_ndk_root)', 1568 'android_ndk_root%': '<(android_ndk_root)',
1564 'android_ndk_sysroot%': '<(android_ndk_sysroot)', 1569 'android_ndk_sysroot%': '<(android_ndk_sysroot)',
1565 'android_sdk_root%': '<(android_sdk_root)', 1570 'android_sdk_root%': '<(android_sdk_root)',
1566 'android_sdk_version%': '<(android_sdk_version)', 1571 'android_sdk_version%': '<(android_sdk_version)',
1567 'android_toolchain%': '<(android_toolchain)', 1572 'android_toolchain%': '<(android_toolchain)',
1568 1573
1569 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', 1574 'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
1570 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', 1575 'android_ndk_lib': '<(android_ndk_sysroot)<(android_ndk_lib_dir)',
rmcilroy 2014/04/28 11:55:13 nit - I would prefer the "/" is here (rather than
1571 'android_sdk_tools%': '<(android_sdk_tools)', 1576 'android_sdk_tools%': '<(android_sdk_tools)',
1572 'android_sdk%': '<(android_sdk)', 1577 'android_sdk%': '<(android_sdk)',
1573 'android_sdk_jar%': '<(android_sdk)/android.jar', 1578 'android_sdk_jar%': '<(android_sdk)/android.jar',
1574 1579
1575 'android_stlport_root': '<(android_stlport_root)', 1580 'android_stlport_root': '<(android_stlport_root)',
1576 'android_stlport_include': '<(android_stlport_root)/stlport', 1581 'android_stlport_include': '<(android_stlport_root)/stlport',
1577 'android_stlport_libs_dir': '<(android_stlport_root)/libs/<(android_app_ abi)', 1582 'android_stlport_libs_dir': '<(android_stlport_root)/libs/<(android_app_ abi)',
1578 'host_os%': '<(host_os)', 1583 'host_os%': '<(host_os)',
1579 1584
1580 # Location of the "strip" binary, used by both gyp and scripts. 1585 # Location of the "strip" binary, used by both gyp and scripts.
(...skipping 3635 matching lines...) Expand 10 before | Expand all | Expand 10 after
5216 # settings in target dicts. SYMROOT is a special case, because many other 5221 # settings in target dicts. SYMROOT is a special case, because many other
5217 # Xcode variables depend on it, including variables such as 5222 # Xcode variables depend on it, including variables such as
5218 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5223 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5219 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5224 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5220 # files to appear (when present) in the UI as actual files and not red 5225 # files to appear (when present) in the UI as actual files and not red
5221 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5226 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5222 # and therefore SYMROOT, needs to be set at the project level. 5227 # and therefore SYMROOT, needs to be set at the project level.
5223 'SYMROOT': '<(DEPTH)/xcodebuild', 5228 'SYMROOT': '<(DEPTH)/xcodebuild',
5224 }, 5229 },
5225 } 5230 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698