summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-29 22:55:46 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-29 22:55:46 +0000
commit5bed2ec38a11d8b11c29b2831cdf19e973879ad0 (patch)
treecf7763b9b991ad7156208740e2c5a316a73f383f /chrome/chrome.gyp
parentf346618f6e1d9746b5b8dcbc1021dd133d136c14 (diff)
downloadchromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.zip
chromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.tar.gz
chromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.tar.bz2
Move default apps from Chrome to Chrome OS
Also changed dir with default apps for managed users. Main CL that moves cache: https://gerrit-int.chromium.org/#/c/42720/ BUG=271247 TEST=manual R=jhawkins@chromium.org, mek@chromium.org Review URL: https://codereview.chromium.org/22931006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp12
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b9988b8..2202c03 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -136,17 +136,7 @@
]
}
],
- }],
- ['OS=="linux" and chromeos==1 and branding=="Chrome"', {
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- 'browser/extensions/default_extensions/chromeos/extensions/'
- ]
- }
- ],
- }],
+ }]
],
},
{