Commit 2dc12722 authored by bulach@chromium.org's avatar bulach@chromium.org

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
Relands crrev.com/270750 (reverted by 270849)

BUG=317523
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/288223005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271047 0039d316-1c4b-4281-b951-d872f2087c98
parent 370aa218
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'android_webview_unittests', 'jni_gen_package': 'android_webview_unittests',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'android_webview', 'jni_gen_package': 'android_webview',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../build/jni_generator.gypi' ], 'includes': [ '../../build/jni_generator.gypi' ],
'dependencies': [ 'dependencies': [
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'example', 'jni_gen_package': 'example',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../../build/jni_generator.gypi' ], 'includes': [ '../../../build/jni_generator.gypi' ],
}, },
......
...@@ -1296,7 +1296,6 @@ ...@@ -1296,7 +1296,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'base', 'jni_gen_package': 'base',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
...@@ -1308,7 +1307,6 @@ ...@@ -1308,7 +1307,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'base', 'jni_gen_package': 'base',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -3637,7 +3637,6 @@ ...@@ -3637,7 +3637,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'chrome', 'jni_gen_package': 'chrome',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -461,7 +461,6 @@ ...@@ -461,7 +461,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'autofill', 'jni_gen_package': 'autofill',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'cronet', 'jni_gen_package': 'cronet',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'navigation_interception', 'jni_gen_package': 'navigation_interception',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'web_contents_delegate_android', 'jni_gen_package': 'web_contents_delegate_android',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -517,7 +517,6 @@ ...@@ -517,7 +517,6 @@
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'jni_gen_package': 'content', 'jni_gen_package': 'content',
'jni_generator_ptr_type': 'long',
'input_java_class': 'android/view/MotionEvent.class', 'input_java_class': 'android/view/MotionEvent.class',
}, },
'includes': [ '../build/jar_file_jni_generator.gypi' ], 'includes': [ '../build/jar_file_jni_generator.gypi' ],
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'content', 'jni_gen_package': 'content',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
} }
...@@ -943,7 +943,6 @@ ...@@ -943,7 +943,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'content/shell', 'jni_gen_package': 'content/shell',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -1617,7 +1617,6 @@ ...@@ -1617,7 +1617,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'content/shell', 'jni_gen_package': 'content/shell',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
...@@ -1644,7 +1643,6 @@ ...@@ -1644,7 +1643,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'content/public/test', 'jni_gen_package': 'content/public/test',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -1592,7 +1592,6 @@ ...@@ -1592,7 +1592,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'media', 'jni_gen_package': 'media',
'jni_generator_ptr_type': 'long',
}, },
'includes': ['../build/jni_generator.gypi'], 'includes': ['../build/jni_generator.gypi'],
}, },
...@@ -1605,7 +1604,6 @@ ...@@ -1605,7 +1604,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'media', 'jni_gen_package': 'media',
'jni_generator_ptr_type': 'long',
}, },
'includes': ['../build/jni_generator.gypi'], 'includes': ['../build/jni_generator.gypi'],
}, },
......
...@@ -688,7 +688,6 @@ ...@@ -688,7 +688,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'mojo', 'jni_gen_package': 'mojo',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
...@@ -776,7 +775,6 @@ ...@@ -776,7 +775,6 @@
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'jni_gen_package': 'mojo', 'jni_gen_package': 'mojo',
'jni_generator_ptr_type': 'long',
'input_java_class': 'java/util/HashSet.class', 'input_java_class': 'java/util/HashSet.class',
}, },
'includes': [ '../build/jar_file_jni_generator.gypi' ], 'includes': [ '../build/jar_file_jni_generator.gypi' ],
......
...@@ -1501,7 +1501,6 @@ ...@@ -1501,7 +1501,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'net', 'jni_gen_package': 'net',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
...@@ -1521,7 +1520,6 @@ ...@@ -1521,7 +1520,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'net', 'jni_gen_package': 'net',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -303,7 +303,6 @@ ...@@ -303,7 +303,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'printing', 'jni_gen_package': 'printing',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'remoting', 'jni_gen_package': 'remoting',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, # end of target 'remoting_jni_headers' }, # end of target 'remoting_jni_headers'
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'java_in_dir': '../sync/android/java', 'java_in_dir': '../sync/android/java',
'jni_generator_ptr_type': 'long',
}, },
'dependencies': [ 'dependencies': [
'../base/base.gyp:base_java', '../base/base.gyp:base_java',
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'testing', 'jni_gen_package': 'testing',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../build/jni_generator.gypi' ], 'includes': [ '../../build/jni_generator.gypi' ],
}, },
......
...@@ -629,7 +629,6 @@ ...@@ -629,7 +629,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'ui', 'jni_gen_package': 'ui',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../build/jni_generator.gypi' ], 'includes': [ '../../build/jni_generator.gypi' ],
}, },
......
...@@ -543,7 +543,6 @@ ...@@ -543,7 +543,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'ui/gfx', 'jni_gen_package': 'ui/gfx',
'jni_generator_ptr_type': 'long'
}, },
'includes': [ '../../build/jni_generator.gypi' ], 'includes': [ '../../build/jni_generator.gypi' ],
}, },
......
...@@ -348,7 +348,6 @@ ...@@ -348,7 +348,6 @@
'variables': { 'variables': {
'jni_gen_package': 'ui/gl', 'jni_gen_package': 'ui/gl',
'input_java_class': 'android/view/Surface.class', 'input_java_class': 'android/view/Surface.class',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../build/jar_file_jni_generator.gypi' ], 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
}, },
...@@ -364,7 +363,6 @@ ...@@ -364,7 +363,6 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'ui/gl', 'jni_gen_package': 'ui/gl',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../../build/jni_generator.gypi' ], 'includes': [ '../../build/jni_generator.gypi' ],
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment