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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/components.gyp

Issue 1103943003: Add components/chrome_apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename component_apps -> chrome_apps Created 5 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 side-by-side diff with in-line comments
Download patch
« components/chrome_apps/webstore_widget/manifest.json ('K') | « components/chrome_apps/webstore_widget_resources.grdp ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components.gyp
diff --git a/components/components.gyp b/components/components.gyp
index 3f6eb49c0cdb69967bd80c9273a0a823d3f36abc..f8dee130bd6ccefd15b196a377aed353fe378510 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -152,5 +152,12 @@
'pdf.gypi',
],
}],
+ # TODO(tbarzic): Remove chromeos condition when there are non-chromeos apps
+ # in components/apps.
+ ['enable_extensions == 1 and chromeos == 1', {
+ 'includes': [
+ 'chrome_apps.gypi',
+ ],
+ }],
],
}
« components/chrome_apps/webstore_widget/manifest.json ('K') | « components/chrome_apps/webstore_widget_resources.grdp ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698