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

Unified Diff: tools/mb/docs/user_guide.md

Issue 1348153003: Reland "Remove the 'gyp_config' concept from MB." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win32 test on non-win32 platform Created 5 years, 3 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 | tools/mb/mb.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/docs/user_guide.md
diff --git a/tools/mb/docs/user_guide.md b/tools/mb/docs/user_guide.md
index e1aba6fd6f02b5ddb582f1e92f9bb25a1903f77c..16a6a7b9ea314e9706e951b02ea86853a8a98412 100644
--- a/tools/mb/docs/user_guide.md
+++ b/tools/mb/docs/user_guide.md
@@ -172,8 +172,6 @@ value of the `mixins` key.
Each mixin value is itself a dictionary that contains one or more of the
following keys:
- * `gyp_configs`: a list of the configurations to build, e.g.,
- ['Release', 'Release_x64'].
* `gyp_crosscompile`: a boolean; if true, GYP_CROSSCOMPILE=1 is set in
the environment and passed to GYP.
* `gyp_defines`: a string containing a list of GYP_DEFINES.
@@ -184,8 +182,8 @@ following keys:
When `mb gen` or `mb analyze` executes, it takes a config name, looks it
up in the 'configs' dict, and then does a left-to-right expansion of the
-mixins; gyp_defines and gn_args values are concatenated, and type and
-gyp_configs values override each other.
+mixins; gyp_defines and gn_args values are concatenated, and the type values
+override each other.
For example, if you had:
@@ -205,7 +203,6 @@ For example, if you had:
},
'gn': {'type': 'gn'},
'gyp_release': {
- 'gyp_config': 'Release'
'mixins': ['release'],
'type': 'gyp',
},
« no previous file with comments | « no previous file | tools/mb/mb.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698