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

Unified Diff: build/common.gypi

Issue 6588053: Initial landing of file_manager component extension (not yet enabled) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 10 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 | chrome/browser/browser_resources.grd » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')
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 5b110d5d112ee57e8409f7c1f02316698393904d..d194462b5ce10de30f235fd4bc1e416babee19d8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -23,10 +23,14 @@
# Disable touch support by default.
'touchui%': 0,
+
+ # Disable file manager component extension by default.
+ 'file_manager_extension%': 0,
zel 2011/02/28 18:41:23 I wouldn't create another build flag since we alre
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
+ 'file_manager_extension%': '<(file_manager_extension)',
# To do a shared build on linux we need to be able to choose between
# type static_library and shared_library. We default to doing a static
@@ -61,6 +65,7 @@
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
+ 'file_manager_extension%': '<(file_manager_extension)',
'host_arch%': '<(host_arch)',
'library%': '<(library)',
'toolkit_views%': '<(toolkit_views)',
@@ -176,6 +181,7 @@
'enable_flapper_hacks%': '<(enable_flapper_hacks)',
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
+ 'file_manager_extension%': '<(file_manager_extension)',
'inside_chromium_build%': '<(inside_chromium_build)',
'fastbuild%': '<(fastbuild)',
'python_ver%': '<(python_ver)',
@@ -485,6 +491,9 @@
['touchui==1', {
'grit_defines': ['-D', 'touchui'],
}],
+ ['file_manager_extension==1', {
+ 'grit_defines': ['-D', 'file_manager_extension'],
+ }],
['remoting==1', {
'grit_defines': ['-D', 'remoting'],
}],
@@ -564,6 +573,9 @@
['touchui==1', {
'defines': ['TOUCH_UI=1'],
}],
+ ['file_manager_extension==1', {
+ 'defines': ['FILE_MANAGER_EXTENSION=1'],
+ }],
['profiling==1', {
'defines': ['ENABLE_PROFILING=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698