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

Side by Side Diff: build/common.gypi

Issue 698483003: Fix: Set Android to go back to CLD2. The CLD version should not have been updated in change 14d913,… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « 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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 }], 740 }],
741 741
742 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 742 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
743 'enable_one_click_signin%': 1, 743 'enable_one_click_signin%': 1,
744 'enable_pre_sync_backup%': 1, 744 'enable_pre_sync_backup%': 1,
745 }], 745 }],
746 746
747 ['OS=="android"', { 747 ['OS=="android"', {
748 'enable_extensions%': 0, 748 'enable_extensions%': 0,
749 'enable_google_now%': 0, 749 'enable_google_now%': 0,
750 'cld_version%': 2, 750 'cld_version%': 1,
751 'enable_spellcheck%': 0, 751 'enable_spellcheck%': 0,
752 'enable_themes%': 0, 752 'enable_themes%': 0,
753 'remoting%': 0, 753 'remoting%': 0,
754 'arm_neon%': 0, 754 'arm_neon%': 0,
755 'arm_neon_optional%': 1, 755 'arm_neon_optional%': 1,
756 'native_discardable_memory%': 1, 756 'native_discardable_memory%': 1,
757 'native_memory_pressure_signals%': 1, 757 'native_memory_pressure_signals%': 1,
758 'enable_basic_printing%': 1, 758 'enable_basic_printing%': 1,
759 'enable_print_preview%': 0, 759 'enable_print_preview%': 0,
760 'enable_task_manager%':0, 760 'enable_task_manager%':0,
(...skipping 5149 matching lines...) Expand 10 before | Expand all | Expand 10 after
5910 # settings in target dicts. SYMROOT is a special case, because many other 5910 # settings in target dicts. SYMROOT is a special case, because many other
5911 # Xcode variables depend on it, including variables such as 5911 # Xcode variables depend on it, including variables such as
5912 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5912 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5913 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5913 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5914 # files to appear (when present) in the UI as actual files and not red 5914 # files to appear (when present) in the UI as actual files and not red
5915 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5915 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5916 # and therefore SYMROOT, needs to be set at the project level. 5916 # and therefore SYMROOT, needs to be set at the project level.
5917 'SYMROOT': '<(DEPTH)/xcodebuild', 5917 'SYMROOT': '<(DEPTH)/xcodebuild',
5918 }, 5918 },
5919 } 5919 }
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