diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 22:00:44 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 22:00:44 +0000 |
| commit | 204c9f5f9b101f57292f445a9f980fb139e2a597 (patch) | |
| tree | 032385893cde42f3073c0283a4a7f9e7e1296943 /content/content.gyp | |
| parent | 6d3d54a2a280f0c63a0dde0db29788bd6cb19ea4 (diff) | |
| download | chromium_src-204c9f5f9b101f57292f445a9f980fb139e2a597.zip chromium_src-204c9f5f9b101f57292f445a9f980fb139e2a597.tar.gz chromium_src-204c9f5f9b101f57292f445a9f980fb139e2a597.tar.bz2 | |
Revert 177765
Failed compile on all Linux bots.
> [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.
>
> Android only change, android bots green.
> NOTRY=true
> BUG=169228
>
>
> Review URL: https://chromiumcodereview.appspot.com/11817047
TBR=benm@chromium.org
Review URL: https://codereview.chromium.org/12018025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/content/content.gyp b/content/content.gyp index 48be229..ae5334a4 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -348,21 +348,9 @@ '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', ], |