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

Side by Side Diff: base/android/library_loader/library_loader_hooks.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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
« no previous file with comments | « base/android/library_loader/library_loader_hooks.h ('k') | base/android/trace_event_binding.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/library_loader/library_loader_hooks.h" 5 #include "base/android/library_loader/library_loader_hooks.h"
6 6
7 #include "base/android/command_line_android.h" 7 #include "base/android/command_line_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/library_loader/library_load_from_apk_status_codes.h" 9 #include "base/android/library_loader/library_load_from_apk_status_codes.h"
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 116 }
117 117
118 void LibraryLoaderExitHook() { 118 void LibraryLoaderExitHook() {
119 if (g_at_exit_manager) { 119 if (g_at_exit_manager) {
120 delete g_at_exit_manager; 120 delete g_at_exit_manager;
121 g_at_exit_manager = NULL; 121 g_at_exit_manager = NULL;
122 } 122 }
123 } 123 }
124 124
125 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 125 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
126 // We need the AtExitManager to be created at the very beginning.
127 g_at_exit_manager = new base::AtExitManager();
128
129 return RegisterNativesImpl(env); 126 return RegisterNativesImpl(env);
130 } 127 }
131 128
132 void SetVersionNumber(const char* version_number) { 129 void SetVersionNumber(const char* version_number) {
133 g_library_version_number = strdup(version_number); 130 g_library_version_number = strdup(version_number);
134 } 131 }
135 132
136 jstring GetVersionNumber(JNIEnv* env, jobject jcaller) { 133 jstring GetVersionNumber(JNIEnv* env, jobject jcaller) {
137 return ConvertUTF8ToJavaString(env, g_library_version_number).Release(); 134 return ConvertUTF8ToJavaString(env, g_library_version_number).Release();
138 } 135 }
139 136
140 LibraryProcessType GetLibraryProcessType(JNIEnv* env) { 137 LibraryProcessType GetLibraryProcessType(JNIEnv* env) {
141 return static_cast<LibraryProcessType>( 138 return static_cast<LibraryProcessType>(
142 Java_LibraryLoader_getLibraryProcessType(env)); 139 Java_LibraryLoader_getLibraryProcessType(env));
143 } 140 }
144 141
142 void InitAtExitManager() {
143 g_at_exit_manager = new base::AtExitManager();
144 }
145
145 } // namespace android 146 } // namespace android
146 } // namespace base 147 } // namespace base
OLDNEW
« no previous file with comments | « base/android/library_loader/library_loader_hooks.h ('k') | base/android/trace_event_binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698