summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android_webview/android_webview_tests.gypi1
-rw-r--r--android_webview/native/webview_native.gyp1
-rw-r--r--base/android/jni_generator/jni_generator.gyp1
-rw-r--r--base/base.gyp2
-rw-r--r--chrome/chrome_browser.gypi1
-rw-r--r--components/autofill.gypi1
-rw-r--r--components/cronet.gypi1
-rw-r--r--components/navigation_interception.gypi1
-rw-r--r--components/web_contents_delegate_android.gypi1
-rw-r--r--content/content.gyp1
-rw-r--r--content/content_jni.gypi1
-rw-r--r--content/content_shell.gypi1
-rw-r--r--content/content_tests.gypi2
-rw-r--r--media/media.gyp2
-rw-r--r--mojo/mojo.gyp2
-rw-r--r--net/net.gyp2
-rw-r--r--printing/printing.gyp1
-rw-r--r--remoting/remoting_android.gypi1
-rw-r--r--sync/sync_android.gypi1
-rw-r--r--testing/android/native_test.gyp1
-rw-r--r--ui/base/ui_base.gyp1
-rw-r--r--ui/gfx/gfx.gyp1
-rw-r--r--ui/gl/gl.gyp2
23 files changed, 29 insertions, 0 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 887d504..b95d7bf 100644
--- 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
index 854bd85..d5941421 100644
--- 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
index 2ea36b0..e93b446 100644
--- 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
index a60d710..c56fb88 100644
--- 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
index dc6b919..3039627 100644
--- 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
index 5972f5d1..b494279 100644
--- 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
index 55bc9d4..5832c6e 100644
--- 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
index ed229ae..97d54b7 100644
--- 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
index fdea3b7..f0c8c94 100644
--- 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
index 9899f92..c7f4569 100644
--- 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
index 42699aa..2ad0dd7 100644
--- 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
index 7a4580e..1deffb8 100644
--- 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
index d25f0fe..6be7280 100644
--- 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
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'],
},
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 9d0b02c..ff710fa 100644
--- 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
index 2160c5c..2e5ee2c 100644
--- 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
index 5b22896..792f5df 100644
--- 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
index 4fedb31..d0865d6 100644
--- 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
index 40e4be2..bdeb2e4 100644
--- 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
index 204ec4b..0007a07 100644
--- 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
index 7b43363..fded8c8 100644
--- 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
index 9f909f9..dd0de8a 100644
--- 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
index ec42a48..d27acc7 100644
--- 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' ],
},