diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 23:25:37 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 23:25:37 +0000 |
| commit | 624e4b57677e02f2706979f1284fe75696c35fd8 (patch) | |
| tree | 21ec81057735c2adca72e5baad5474233c73583e /base/android | |
| parent | 736a49c269f9b996c15ac694231fd4fc22fa9183 (diff) | |
| download | chromium_src-624e4b57677e02f2706979f1284fe75696c35fd8.zip chromium_src-624e4b57677e02f2706979f1284fe75696c35fd8.tar.gz chromium_src-624e4b57677e02f2706979f1284fe75696c35fd8.tar.bz2 | |
Revert "Revert 160537 - Update jni generator for Android."
This reverts commit 64bfe38c416b0024c63cfeb932e8d3eac9f026b6.
The original CL was reverted due to build failure:
https://chromiumcodereview.appspot.com/11026080
BUG=
Review URL: https://chromiumcodereview.appspot.com/11096002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
| -rwxr-xr-x | base/android/jni_generator/jni_generator.py | 7 | ||||
| -rwxr-xr-x | base/android/jni_generator/jni_generator_tests.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py index 354e33a..3ac64cf 100755 --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py @@ -154,13 +154,11 @@ def JavaParamToJni(param): app_param_list = [ 'Landroid/graphics/SurfaceTexture', 'Lcom/google/android/apps/chrome/AutofillData', - 'Lcom/google/android/apps/chrome/ChromeHttpAuthHandler', 'Lcom/google/android/apps/chrome/ChromeContextMenuInfo', 'Lcom/google/android/apps/chrome/ChromeWindow', 'Lcom/google/android/apps/chrome/OmniboxSuggestion', 'Lcom/google/android/apps/chrome/PageInfoViewer', 'Lcom/google/android/apps/chrome/Tab', - 'Lcom/google/android/apps/chrome/database/SQLiteCursor', 'Lcom/google/android/apps/chrome/infobar/InfoBarContainer', 'Lcom/google/android/apps/chrome/infobar/InfoBarContainer$NativeInfoBar', ('Lcom/google/android/apps/chrome/preferences/ChromeNativePreferences$' @@ -176,21 +174,22 @@ def JavaParamToJni(param): 'Lorg/chromium/android_webview/JsResultReceiver', 'Lorg/chromium/base/SystemMessageHandler', 'Lorg/chromium/chrome/browser/ChromeBrowserProvider$BookmarkNode', + 'Lorg/chromium/chrome/browser/ChromeHttpAuthHandler', 'Lorg/chromium/chrome/browser/ChromeWebContentsDelegateAndroid', 'Lorg/chromium/chrome/browser/FindMatchRectsDetails', 'Lorg/chromium/chrome/browser/FindNotificationDetails', 'Lorg/chromium/chrome/browser/JavascriptAppModalDialog', 'Lorg/chromium/chrome/browser/ProcessUtils', 'Lorg/chromium/chrome/browser/component/web_contents_delegate_android/WebContentsDelegateAndroid', + 'Lorg/chromium/chrome/browser/database/SQLiteCursor', + 'Lorg/chromium/content/app/SandboxedProcessService', 'Lorg/chromium/content/browser/ContentVideoView', 'Lorg/chromium/content/browser/ContentViewCore', 'Lorg/chromium/content/browser/DeviceOrientation', - 'Lorg/chromium/content/browser/FindNotificationDetails', 'Lorg/chromium/content/browser/JavaInputStream', 'Lorg/chromium/content/browser/LocationProvider', 'Lorg/chromium/content/browser/SandboxedProcessArgs', 'Lorg/chromium/content/browser/SandboxedProcessConnection', - 'Lorg/chromium/content/app/SandboxedProcessService', 'Lorg/chromium/content/browser/TouchPoint', 'Lorg/chromium/content/browser/WaitableNativeEvent', 'Lorg/chromium/content/browser/WebContentsObserverAndroid', diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py index ba9ee21..23efa02 100755 --- a/base/android/jni_generator/jni_generator_tests.py +++ b/base/android/jni_generator/jni_generator_tests.py @@ -403,7 +403,7 @@ static bool RegisterNativesImpl(JNIEnv* env) { "[Ljava/lang/String;" "Ljava/lang/String;" ")" -"Lcom/google/android/apps/chrome/database/SQLiteCursor;", +"Lorg/chromium/chrome/browser/database/SQLiteCursor;", reinterpret_cast<void*>(QueryBookmarkFromAPI) }, { "nativeGotOrientation", "(" |