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

Side by Side Diff: build/common.gypi

Issue 664383004: Merge ARM sysroot install script with existing x86/amd64 one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « android_webview/tools/webview_licenses.py ('k') | build/linux/install-arm-sysroot.py » ('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 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 'enable_settings_app%': 1, 896 'enable_settings_app%': 1,
897 }, { 897 }, {
898 'enable_settings_app%': 0, 898 'enable_settings_app%': 0,
899 }], 899 }],
900 900
901 ['OS=="linux" and target_arch=="arm" and chromeos==0', { 901 ['OS=="linux" and target_arch=="arm" and chromeos==0', {
902 # Set some defaults for arm/linux chrome builds 902 # Set some defaults for arm/linux chrome builds
903 'use_allocator%': 'none', 903 'use_allocator%': 'none',
904 # sysroot needs to be an absolute path otherwise it generates 904 # sysroot needs to be an absolute path otherwise it generates
905 # incorrect results when passed to pkg-config 905 # incorrect results when passed to pkg-config
906 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', 906 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_w heezy_arm-sysroot',
907 }], # OS=="linux" and target_arch=="arm" and chromeos==0 907 }], # OS=="linux" and target_arch=="arm" and chromeos==0
908 908
909 ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chrom eos==0', { 909 ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chrom eos==0', {
910 'conditions': [ 910 'conditions': [
911 ['target_arch=="x64"', { 911 ['target_arch=="x64"', {
912 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi an_wheezy_amd64-sysroot', 912 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi an_wheezy_amd64-sysroot',
913 }], 913 }],
914 ['target_arch=="ia32"', { 914 ['target_arch=="ia32"', {
915 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi an_wheezy_i386-sysroot', 915 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi an_wheezy_i386-sysroot',
916 }], 916 }],
(...skipping 4831 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 | « android_webview/tools/webview_licenses.py ('k') | build/linux/install-arm-sysroot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698