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

Side by Side Diff: build/common.gypi

Issue 8391011: Make sure that the builder includes the search app crx in the installer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/default_apps/external_extensions.json » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 864
865 ['asan==1', { 865 ['asan==1', {
866 'clang%': 1, 866 'clang%': 1,
867 # Do not use Chrome plugins for Clang. The Clang version in 867 # Do not use Chrome plugins for Clang. The Clang version in
868 # third_party/asan may be different from the default one. 868 # third_party/asan may be different from the default one.
869 'clang_use_chrome_plugins%': 0, 869 'clang_use_chrome_plugins%': 0,
870 }], 870 }],
871 ], 871 ],
872 # List of default apps to install in new profiles. The first list contains 872 # List of default apps to install in new profiles. The first list contains
873 # the source files as found in svn. The second list, used only for linux, 873 # the source files as found in svn. The second list, used only for linux,
874 # contains the destination location for each of the files. 874 # contains the destination location for each of the files. When a crx
875 # is added or removed from the list, the chrome/browser/resources/
876 # default_apps/external_extensions.json file must also be updated.
875 'default_apps_list': [ 877 'default_apps_list': [
876 'browser/resources/default_apps/external_extensions.json', 878 'browser/resources/default_apps/external_extensions.json',
877 'browser/resources/default_apps/gmail.crx', 879 'browser/resources/default_apps/gmail.crx',
880 'browser/resources/default_apps/search.crx',
878 'browser/resources/default_apps/youtube.crx', 881 'browser/resources/default_apps/youtube.crx',
879 ], 882 ],
880 'default_apps_list_linux_dest': [ 883 'default_apps_list_linux_dest': [
881 '<(PRODUCT_DIR)/default_apps/external_extensions.json', 884 '<(PRODUCT_DIR)/default_apps/external_extensions.json',
882 '<(PRODUCT_DIR)/default_apps/gmail.crx', 885 '<(PRODUCT_DIR)/default_apps/gmail.crx',
886 '<(PRODUCT_DIR)/default_apps/search.crx',
883 '<(PRODUCT_DIR)/default_apps/youtube.crx', 887 '<(PRODUCT_DIR)/default_apps/youtube.crx',
884 ], 888 ],
885 }, 889 },
886 'target_defaults': { 890 'target_defaults': {
887 'variables': { 891 'variables': {
888 # The condition that operates on chromium_code is in a target_conditions 892 # The condition that operates on chromium_code is in a target_conditions
889 # section, and will not have access to the default fallback value of 893 # section, and will not have access to the default fallback value of
890 # chromium_code at the top of this file, or to the chromium_code 894 # chromium_code at the top of this file, or to the chromium_code
891 # variable placed at the root variables scope of .gyp files, because 895 # variable placed at the root variables scope of .gyp files, because
892 # those variables are not set at target scope. As a workaround, 896 # those variables are not set at target scope. As a workaround,
(...skipping 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
2584 # settings in target dicts. SYMROOT is a special case, because many other 2588 # settings in target dicts. SYMROOT is a special case, because many other
2585 # Xcode variables depend on it, including variables such as 2589 # Xcode variables depend on it, including variables such as
2586 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2590 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2587 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2591 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2588 # files to appear (when present) in the UI as actual files and not red 2592 # files to appear (when present) in the UI as actual files and not red
2589 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2593 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2590 # and therefore SYMROOT, needs to be set at the project level. 2594 # and therefore SYMROOT, needs to be set at the project level.
2591 'SYMROOT': '<(DEPTH)/xcodebuild', 2595 'SYMROOT': '<(DEPTH)/xcodebuild',
2592 }, 2596 },
2593 } 2597 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/default_apps/external_extensions.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698