From 464750f4c63d803b27a80cbcd58fa5fdebee7247 Mon Sep 17 00:00:00 2001 From: "steveblock@chromium.org" Date: Mon, 24 Oct 2011 23:16:18 +0000 Subject: 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 --- build/common.gypi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'build') 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 -- cgit v1.1