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
SaschaDeWaal · May 15, 2014 · 36a49fc · 36a49fc
1 parent 5183e54
commit 36a49fc
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 0 deletions.
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
@@ -131,6 +131,7 @@
       ],
       'variables': {
         'jni_gen_package': 'android_webview_unittests',
+        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../build/jni_generator.gypi' ],
     },

diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
@@ -148,6 +148,7 @@
       ],
       'variables': {
         'jni_gen_package': 'android_webview',
+        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../../build/jni_generator.gypi' ],
       'dependencies': [

diff --git a/base/android/jni_generator/jni_generator.gyp b/base/android/jni_generator/jni_generator.gyp
@@ -33,6 +33,7 @@
       ],
       'variables': {
         'jni_gen_package': 'example',
+        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../../../build/jni_generator.gypi' ],
     },

diff --git a/base/base.gyp b/base/base.gyp
@@ -1296,6 +1296,7 @@
           ],
           'variables': {
             'jni_gen_package': 'base',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1307,6 +1308,7 @@
           ],
           'variables': {
             'jni_gen_package': 'base',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -3634,6 +3634,7 @@
           ],
           'variables': {
             'jni_gen_package': 'chrome',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/components/autofill.gypi b/components/autofill.gypi
@@ -461,6 +461,7 @@
           ],
           'variables': {
             'jni_gen_package': 'autofill',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/components/cronet.gypi b/components/cronet.gypi
@@ -17,6 +17,7 @@
           ],
           'variables': {
             'jni_gen_package': 'cronet',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
@@ -65,6 +65,7 @@
           ],
           'variables': {
             'jni_gen_package': 'navigation_interception',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
@@ -58,6 +58,7 @@
           ],
           'variables': {
             'jni_gen_package': 'web_contents_delegate_android',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/content/content.gyp b/content/content.gyp
@@ -555,6 +555,7 @@
           'type': 'none',
           'variables': {
              'jni_gen_package': 'content',
+             'jni_generator_ptr_type': 'long',
              'input_java_class': 'android/view/MotionEvent.class',
            },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],

diff --git a/content/content_jni.gypi b/content/content_jni.gypi
@@ -43,6 +43,7 @@
    ],
   'variables': {
     'jni_gen_package': 'content',
+    'jni_generator_ptr_type': 'long',
   },
   'includes': [ '../build/jni_generator.gypi' ],
 }
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -943,6 +943,7 @@
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -1616,6 +1616,7 @@
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1642,6 +1643,7 @@
           ],
           'variables': {
             'jni_gen_package': 'content/public/test',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git 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'],
         },

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
@@ -688,6 +688,7 @@
           ],
           'variables': {
             'jni_gen_package': 'mojo',
+            'jni_generator_ptr_type': 'long',
          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -775,6 +776,7 @@
           'type': 'none',
           'variables': {
             'jni_gen_package': 'mojo',
+            'jni_generator_ptr_type': 'long',
             'input_java_class': 'java/util/HashSet.class',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],

diff --git a/net/net.gyp b/net/net.gyp
@@ -1501,6 +1501,7 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
 
@@ -1520,6 +1521,7 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/printing/printing.gyp b/printing/printing.gyp
@@ -303,6 +303,7 @@
           ],
           'variables': {
             'jni_gen_package': 'printing',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },

diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
@@ -14,6 +14,7 @@
           ],
           'variables': {
             'jni_gen_package': 'remoting',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },  # end of target 'remoting_jni_headers'

diff --git a/sync/sync_android.gypi b/sync/sync_android.gypi
@@ -11,6 +11,7 @@
           'type': 'none',
           'variables': {
             'java_in_dir': '../sync/android/java',
+            'jni_generator_ptr_type': 'long',
           },
           'dependencies': [
             '../base/base.gyp:base_java',

diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
@@ -37,6 +37,7 @@
           ],
           'variables': {
             'jni_gen_package': 'testing',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },

diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
@@ -629,6 +629,7 @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
+             'jni_generator_ptr_type': 'long',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },

diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
@@ -543,6 +543,7 @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
+           'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },

diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
@@ -348,6 +348,7 @@
           'variables': {
             'jni_gen_package': 'ui/gl',
             'input_java_class': 'android/view/Surface.class',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
@@ -363,6 +364,7 @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },