summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
diff options
context:
space:
mode:
authorbenm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-21 19:24:34 +0000
committerbenm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-21 19:24:34 +0000
commit4cc1ab59f687e8d209457be809ed79eb9ab77240 (patch)
treecd267e8b7bef06ef19a0c1d2a67b011d12320df8 /content/content.gyp
parent1c3f7002d91087f655dc805ac115e69ce1dc02fb (diff)
downloadchromium_src-4cc1ab59f687e8d209457be809ed79eb9ab77240.zip
chromium_src-4cc1ab59f687e8d209457be809ed79eb9ab77240.tar.gz
chromium_src-4cc1ab59f687e8d209457be809ed79eb9ab77240.tar.bz2
[Android] Manage CVC's retained JS object set on the native side.
Move management of the js retained object set to the native java bridge. BUG=169228 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177765 Reverted in https://chromiumcodereview.appspot.com/11817047 Review URL: https://chromiumcodereview.appspot.com/11817047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
-rw-r--r--content/content.gyp12
1 files changed, 12 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp
index 853d17a..31b8335 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -348,9 +348,21 @@
'includes': [ '../build/jar_file_jni_generator.gypi' ],
},
{
+ 'target_name': 'java_set_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'jni_gen_dir': 'content',
+ 'input_java_class': 'java/util/HashSet.class',
+ 'input_jar_file': '<(android_sdk)/android.jar',
+ },
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ],
+ },
+
+ {
'target_name': 'content_jni_headers',
'type': 'none',
'dependencies': [
+ 'java_set_jni_headers',
'surface_texture_jni_headers',
'surface_jni_headers',
],