diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 23:16:18 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 23:16:18 +0000 |
| commit | 464750f4c63d803b27a80cbcd58fa5fdebee7247 (patch) | |
| tree | e5ceab13224b67fcb18fd6981d4398dac3cc0a1e /build | |
| parent | 2d790ccf202b1a19d4382179a326b22d592187b3 (diff) | |
| download | chromium_src-464750f4c63d803b27a80cbcd58fa5fdebee7247.zip chromium_src-464750f4c63d803b27a80cbcd58fa5fdebee7247.tar.gz chromium_src-464750f4c63d803b27a80cbcd58fa5fdebee7247.tar.bz2 | |
Add ENABLE_JAVA_BRIDGE
This flag allows us to avoid compiling and executing JavaBridge code when the
feature is not required. The flag defaults to off, but is enabled on Android.
BUG=96703
Review URL: http://codereview.chromium.org/8383001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index d6ba8af..bcbca12 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -144,7 +144,7 @@ # Set to 1 to enable dcheck in release without having to use the flag. 'dcheck_always_on%': 0, - # Disable file manager component extension by default. + # Disable file manager component extension by default. 'file_manager_extension%': 0, # Enable WebUI TaskManager by default. @@ -607,6 +607,9 @@ # Point to ICU directory. 'icu_src_dir': '../third_party/icu', + # The Java Bridge is not compiled in by default. + 'java_bridge%': 0, + 'conditions': [ # Used to disable Native Client at compile time, for platforms where it # isn't supported (ARM) @@ -662,6 +665,7 @@ 'safe_browsing%': 0, 'configuration_policy%': 0, 'input_speech%': 0, + 'java_bridge%': 1, # Builds the gtest targets as a shared_library. # TODO(michaelbai): Use the fixed value 'shared_library' once it |