Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1427 # Android API level 14 is ICS (Android 4.0) which is the minimum | 1427 # Android API level 14 is ICS (Android 4.0) which is the minimum |
| 1428 # platform requirement for Chrome on Android, we use it for native | 1428 # platform requirement for Chrome on Android, we use it for native |
| 1429 # code compilation. | 1429 # code compilation. |
| 1430 'conditions': [ | 1430 'conditions': [ |
| 1431 ['target_arch == "ia32"', { | 1431 ['target_arch == "ia32"', { |
| 1432 'android_app_abi%': 'x86', | 1432 'android_app_abi%': 'x86', |
| 1433 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', | 1433 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gd bserver/gdbserver', |
| 1434 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', | 1434 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-x86', |
| 1435 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin', | 1435 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/preb uilt/<(host_os)-<(android_host_arch)/bin', |
| 1436 }], | 1436 }], |
| 1437 ['target_arch == "x64"', { | |
| 1438 'android_app_abi%': 'x86_64', | |
| 1439 }], | |
|
Yang Gu
2014/03/13 10:07:29
Only the abi is defined here, and the other three
Torne
2014/03/13 11:04:46
I'm not sure what you mean here.
Yang Gu
2014/03/13 16:06:07
This is the same reason as I tried to explicitly d
| |
| 1437 ['target_arch=="arm"', { | 1440 ['target_arch=="arm"', { |
| 1438 'conditions': [ | 1441 'conditions': [ |
| 1439 ['arm_version<7', { | 1442 ['arm_version<7', { |
| 1440 'android_app_abi%': 'armeabi', | 1443 'android_app_abi%': 'armeabi', |
| 1441 }, { | 1444 }, { |
| 1442 'android_app_abi%': 'armeabi-v7a', | 1445 'android_app_abi%': 'armeabi-v7a', |
| 1443 }], | 1446 }], |
| 1444 ], | 1447 ], |
| 1445 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', | 1448 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gd bserver/gdbserver', |
| 1446 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm', | 1449 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-arm', |
| 1447 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', | 1450 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', |
| 1448 }], | 1451 }], |
| 1449 ['target_arch == "mipsel"', { | 1452 ['target_arch == "mipsel"', { |
| 1450 'android_app_abi%': 'mips', | 1453 'android_app_abi%': 'mips', |
| 1451 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver', | 1454 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/g dbserver/gdbserver', |
| 1452 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips', | 1455 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/ arch-mips', |
| 1453 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', | 1456 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', |
| 1454 }], | 1457 }], |
| 1455 ], | 1458 ], |
| 1456 }, | 1459 }, |
| 1457 # Copy conditionally-set variables out one scope. | 1460 # Copy conditionally-set variables out one scope. |
| 1458 'android_app_abi%': '<(android_app_abi)', | 1461 'android_app_abi%': '<(android_app_abi)', |
| 1459 'android_gdbserver%': '<(android_gdbserver)', | 1462 'android_gdbserver%': '<(android_gdbserver)', |
| 1460 'android_ndk_root%': '<(android_ndk_root)', | 1463 'android_ndk_root%': '<(android_ndk_root)', |
| 1461 'android_ndk_sysroot': '<(android_ndk_sysroot)', | 1464 'android_ndk_sysroot%': '<(android_ndk_sysroot)', |
|
Yang Gu
2014/03/13 10:07:29
This is a typo, right?
Torne
2014/03/13 11:04:46
Yes. Everything in common.gypi should have a % so
| |
| 1462 'android_sdk_root%': '<(android_sdk_root)', | 1465 'android_sdk_root%': '<(android_sdk_root)', |
| 1463 'android_sdk_version%': '<(android_sdk_version)', | 1466 'android_sdk_version%': '<(android_sdk_version)', |
| 1464 'android_toolchain%': '<(android_toolchain)', | 1467 'android_toolchain%': '<(android_toolchain)', |
| 1465 | 1468 |
| 1466 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', | 1469 'android_ndk_include': '<(android_ndk_sysroot)/usr/include', |
| 1467 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', | 1470 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib', |
| 1468 'android_sdk_tools%': '<(android_sdk_tools)', | 1471 'android_sdk_tools%': '<(android_sdk_tools)', |
| 1469 'android_sdk%': '<(android_sdk)', | 1472 'android_sdk%': '<(android_sdk)', |
| 1470 'android_sdk_jar%': '<(android_sdk)/android.jar', | 1473 'android_sdk_jar%': '<(android_sdk)/android.jar', |
| 1471 | 1474 |
| (...skipping 3590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5062 # settings in target dicts. SYMROOT is a special case, because many other | 5065 # settings in target dicts. SYMROOT is a special case, because many other |
| 5063 # Xcode variables depend on it, including variables such as | 5066 # Xcode variables depend on it, including variables such as |
| 5064 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5067 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5065 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5068 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5066 # files to appear (when present) in the UI as actual files and not red | 5069 # files to appear (when present) in the UI as actual files and not red |
| 5067 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5070 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5068 # and therefore SYMROOT, needs to be set at the project level. | 5071 # and therefore SYMROOT, needs to be set at the project level. |
| 5069 'SYMROOT': '<(DEPTH)/xcodebuild', | 5072 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5070 }, | 5073 }, |
| 5071 } | 5074 } |
| OLD | NEW |