Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Side by Side Diff: content/shell/android/linker_test_apk/content_linker_test_android.cc

Issue 23717023: Android: Add chrome-specific dynamic linker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update content_tests.gypi Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/jni_android.h"
6 #include "base/android/jni_registrar.h"
5 #include "base/basictypes.h" 7 #include "base/basictypes.h"
6 #include "base/debug/debugger.h" 8 #include "base/debug/debugger.h"
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h"
10 #include "content/public/app/android_library_loader_hooks.h" 10 #include "content/public/app/android_library_loader_hooks.h"
11 #include "content/public/app/content_main.h" 11 #include "content/public/app/content_main.h"
12 #include "content/public/browser/android/compositor.h" 12 #include "content/public/browser/android/compositor.h"
13 #include "content/shell/android/linker_test_apk/content_linker_test_linker_tests .h"
13 #include "content/shell/android/shell_jni_registrar.h" 14 #include "content/shell/android/shell_jni_registrar.h"
14 #include "content/shell/app/shell_main_delegate.h" 15 #include "content/shell/app/shell_main_delegate.h"
15 16
16 // This is called by the VM when the shared library is first loaded. 17 // This is called by the VM when the shared library is first loaded.
17 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 18 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
18 base::android::InitVM(vm); 19 base::android::InitVM(vm);
19 JNIEnv* env = base::android::AttachCurrentThread(); 20 JNIEnv* env = base::android::AttachCurrentThread();
20 21
21 if (!content::RegisterLibraryLoaderEntryHook(env)) 22 if (!content::RegisterLibraryLoaderEntryHook(env))
22 return -1; 23 return -1;
23 24
24 // To be called only from the UI thread. If loading the library is done on 25 // To be called only from the UI thread. If loading the library is done on
25 // a separate thread, this should be moved elsewhere. 26 // a separate thread, this should be moved elsewhere.
26 if (!content::android::RegisterShellJni(env)) 27 if (!content::android::RegisterShellJni(env))
27 return -1; 28 return -1;
28 29
30 if (!content::RegisterLinkerTestsJni(env))
31 return -1;
32
29 content::Compositor::Initialize(); 33 content::Compositor::Initialize();
30 content::SetContentMainDelegate(new content::ShellMainDelegate()); 34 content::SetContentMainDelegate(new content::ShellMainDelegate());
31 return JNI_VERSION_1_4; 35 return JNI_VERSION_1_4;
32 } 36 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698