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

Side by Side Diff: build/common.gypi

Issue 10065018: Temporarily make unit_tests a static library on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added android_unit_test_target_Type Created 8 years, 8 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 | « build/all_android.gyp ('k') | chrome/chrome_tests.gypi » ('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 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 'use_libffmpeg%': '0', 839 'use_libffmpeg%': '0',
840 840
841 # Always use the chromium skia. The use_system_harfbuzz needs to 841 # Always use the chromium skia. The use_system_harfbuzz needs to
842 # match use_system_skia. 842 # match use_system_skia.
843 'use_system_skia%': '0', 843 'use_system_skia%': '0',
844 'use_system_harfbuzz%': '0', 844 'use_system_harfbuzz%': '0',
845 845
846 # Use the system icu. 846 # Use the system icu.
847 'use_system_icu%': 0, 847 'use_system_icu%': 0,
848 848
849 # TODO(yfriedman): Remove once unit_tests can link for Android.
John Grabowski 2012/04/12 20:12:01 Add comment with the exact command line to overrid
850 'android_unit_test_target_type%': 'static_library',
851
849 # Choose static link by build type. 852 # Choose static link by build type.
850 'conditions': [ 853 'conditions': [
851 ['android_build_type==0', { 854 ['android_build_type==0', {
852 'static_link_system_icu%': 1, 855 'static_link_system_icu%': 1,
853 }, { 856 }, {
854 'static_link_system_icu%': 0, 857 'static_link_system_icu%': 0,
855 }], 858 }],
856 ], 859 ],
857 # Enable to use system sqlite. 860 # Enable to use system sqlite.
858 'use_system_sqlite%': '<(android_build_type)', 861 'use_system_sqlite%': '<(android_build_type)',
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after
2992 # settings in target dicts. SYMROOT is a special case, because many other 2995 # settings in target dicts. SYMROOT is a special case, because many other
2993 # Xcode variables depend on it, including variables such as 2996 # Xcode variables depend on it, including variables such as
2994 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2997 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2995 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2998 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2996 # files to appear (when present) in the UI as actual files and not red 2999 # files to appear (when present) in the UI as actual files and not red
2997 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3000 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2998 # and therefore SYMROOT, needs to be set at the project level. 3001 # and therefore SYMROOT, needs to be set at the project level.
2999 'SYMROOT': '<(DEPTH)/xcodebuild', 3002 'SYMROOT': '<(DEPTH)/xcodebuild',
3000 }, 3003 },
3001 } 3004 }
OLDNEW
« no previous file with comments | « build/all_android.gyp ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698