summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 23:23:55 +0000
committerjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-15 23:23:55 +0000
commit36a49fcf48cfe7b1550e5d7e590acb8f848f2bec (patch)
treec956bd51832618aed71797c213dbff8e45a1bdbc /media
parent5183e5496b8dda4b724f12f2351871b9fcf9820c (diff)
downloadchromium_src-36a49fcf48cfe7b1550e5d7e590acb8f848f2bec.zip
chromium_src-36a49fcf48cfe7b1550e5d7e590acb8f848f2bec.tar.gz
chromium_src-36a49fcf48cfe7b1550e5d7e590acb8f848f2bec.tar.bz2
Revert 270750 "Android: cleans up jni_generator_ptr_type."
Suspected to cause Android Tests bot failure: http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/13592 > Android: cleans up jni_generator_ptr_type. > > The underlying rule is now "long" by default. > Mechanical change: > git grep -l jni_generator_ptr_type | xargs sed -i /jni_generator_ptr_type/d > > BUG=317523 > TBR=darin@chromium.org > > Review URL: https://codereview.chromium.org/288963002 TBR=bulach@chromium.org Review URL: https://codereview.chromium.org/292433004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 4729bec..db56ca8 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1592,6 +1592,7 @@
],
'variables': {
'jni_gen_package': 'media',
+ 'jni_generator_ptr_type': 'long',
},
'includes': ['../build/jni_generator.gypi'],
},
@@ -1604,6 +1605,7 @@
],
'variables': {
'jni_gen_package': 'media',
+ 'jni_generator_ptr_type': 'long',
},
'includes': ['../build/jni_generator.gypi'],
},