| Index: mojo/tools/mojob.sh
|
| diff --git a/mojo/tools/mojob.sh b/mojo/tools/mojob.sh
|
| index 2f72092d1bdde426de45c0c606cf55c0927098d6..7d887e703fa4c7130733050bdb191b1037296863 100755
|
| --- a/mojo/tools/mojob.sh
|
| +++ b/mojo/tools/mojob.sh
|
| @@ -35,6 +35,9 @@ option (which will only apply to following commands) should be one of:
|
| Component options:
|
| --shared Build components as shared libraries (default).
|
| --static Build components as static libraries.
|
| + Mojo in chromium/content (crbug.com/353602):
|
| + --use-mojo - Enabled (default).
|
| + --no-use-mojo - Disabled.
|
|
|
| Note: It will abort on the first failure (if any).
|
| EOF
|
| @@ -87,6 +90,9 @@ should_do_Release() {
|
| COMPILER=clang
|
| # Valid values: shared or static.
|
| COMPONENT=shared
|
| +# TODO(vtl): Remove this. crbug.com/353602
|
| +# Valid values: enabled or disabled.
|
| +USE_MOJO=enabled
|
| make_gyp_defines() {
|
| local options=()
|
| # Always include these options.
|
| @@ -107,6 +113,14 @@ make_gyp_defines() {
|
| options+=("component=static_library")
|
| ;;
|
| esac
|
| + case "$USE_MOJO" in
|
| + enabled)
|
| + options+=("use_mojo=1")
|
| + ;;
|
| + disabled)
|
| + options+=("use_mojo=0")
|
| + ;;
|
| + esac
|
| echo ${options[*]}
|
| }
|
|
|
| @@ -174,6 +188,12 @@ for arg in "$@"; do
|
| --static)
|
| COMPONENT=static
|
| ;;
|
| + --use-mojo)
|
| + USE_MOJO=enabled
|
| + ;;
|
| + --no-use-mojo)
|
| + USE_MOJO=disabled
|
| + ;;
|
| *)
|
| echo "Unknown command \"${arg}\". Try \"$(basename "$0") help\"."
|
| exit 1
|
|
|