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

Unified Diff: build/common.gypi

Issue 10356107: Forgot to add docs.crx to the list of files to copy in r135906. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 47e937d214532028a7c5fed7531dc84f2f908214..7e64aa0806784fefe01ee04bc719bfe867caae65 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -40,14 +40,14 @@
# Enable HiDPI support.
'enable_hidpi%': 0,
-
+
# Enable touch optimized art assets and metrics.
'enable_touch_ui%': 0,
# Enable inclusion of touch-optimized resources.
# TODO(joi): Rename to enable_touch_assets.
'enable_metro%': 0,
-
+
# Is this change part of the android upstream bringup?
# Allows us to *temporarily* disable certain things for
# staging. Only set to 1 in a GYP_DEFINES.
@@ -105,7 +105,7 @@
['OS=="mac"', {
'enable_hidpi%': 1,
}],
-
+
# Enable touch UI on Metro and Chrome OS.
['enable_metro==1 or chromeos==1', {
'enable_touch_ui%': 1,
@@ -819,9 +819,9 @@
'variables': {
'variables': {
'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
- # Android uses x86 instead of ia32 for their target_arch
+ # Android uses x86 instead of ia32 for their target_arch
# designation.
- # TODO(wistoch): Adjust the target_arch naming scheme to avoid
+ # TODO(wistoch): Adjust the target_arch naming scheme to avoid
# confusion.
# http://crbug.com/125329
'conditions': [
@@ -1140,12 +1140,14 @@
# default_apps/external_extensions.json file must also be updated.
'default_apps_list': [
'browser/resources/default_apps/external_extensions.json',
+ 'browser/resources/default_apps/docs.crx',
'browser/resources/default_apps/gmail.crx',
'browser/resources/default_apps/search.crx',
'browser/resources/default_apps/youtube.crx',
],
'default_apps_list_linux_dest': [
'<(PRODUCT_DIR)/default_apps/external_extensions.json',
+ '<(PRODUCT_DIR)/default_apps/docs.crx',
'<(PRODUCT_DIR)/default_apps/gmail.crx',
'<(PRODUCT_DIR)/default_apps/search.crx',
'<(PRODUCT_DIR)/default_apps/youtube.crx',
« 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