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

Side by Side Diff: trunk/src/build/common.gypi

Issue 24729002: Revert 225398 "Fix a threading bug in the brlapi basec braille c..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h » ('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 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 }], 1777 }],
1778 1778
1779 ['android_webview_build==1', { 1779 ['android_webview_build==1', {
1780 # The WebView build gets its cpu-specific flags from the Android build s ystem. 1780 # The WebView build gets its cpu-specific flags from the Android build s ystem.
1781 'arm_arch%': '', 1781 'arm_arch%': '',
1782 'arm_tune%': '', 1782 'arm_tune%': '',
1783 'arm_fpu%': '', 1783 'arm_fpu%': '',
1784 'arm_float_abi%': '', 1784 'arm_float_abi%': '',
1785 'arm_thumb%': 0, 1785 'arm_thumb%': 0,
1786 }], 1786 }],
1787
1788 # Enable brlapi by default for chromeos.
1789 [ 'chromeos==1', {
1790 'use_brlapi%': 1,
1791 }],
1792 ], 1787 ],
1793 1788
1794 1789
1795 # The path to the ANGLE library. TODO(apatrick): This is to help 1790 # The path to the ANGLE library. TODO(apatrick): This is to help
1796 # transition to a new version of ANGLE at a new location. After the 1791 # transition to a new version of ANGLE at a new location. After the
1797 # transition is complete, this can be removed. 1792 # transition is complete, this can be removed.
1798 'angle_path': '<(DEPTH)/third_party/angle_dx11', 1793 'angle_path': '<(DEPTH)/third_party/angle_dx11',
1799 1794
1800 # List of default apps to install in new profiles. The first list contains 1795 # List of default apps to install in new profiles. The first list contains
1801 # the source files as found in svn. The second list, used only for linux, 1796 # the source files as found in svn. The second list, used only for linux,
(...skipping 2935 matching lines...) Expand 10 before | Expand all | Expand 10 after
4737 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4738 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4739 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4740 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4741 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4742 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4743 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4744 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4745 }, 4740 },
4746 } 4741 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698