From 2ff973cc395007ddbcf6b498c8de8880d77dd787 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Wed, 22 Oct 2014 21:02:23 +0100 Subject: [native bridge] Make sure we always unload the native bridge libnativebridge may allocate some resources during loading and intialization and de-allocate them when unloading. This makes sure that we don't leak anything. Bug: 18097480 (cherry picked from commit 07d83c7a25022064ac0a8dac4fe2a7a38681fa4b) Change-Id: I3a5155a6760399ccfaf9130c72679615a3d4f2e7 --- runtime/native_bridge_art_interface.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/native_bridge_art_interface.cc') diff --git a/runtime/native_bridge_art_interface.cc b/runtime/native_bridge_art_interface.cc index cc44615..28eebdd 100644 --- a/runtime/native_bridge_art_interface.cc +++ b/runtime/native_bridge_art_interface.cc @@ -107,10 +107,11 @@ static android::NativeBridgeRuntimeCallbacks native_bridge_art_callbacks_ { GetMethodShorty, GetNativeMethodCount, GetNativeMethods }; -void LoadNativeBridge(std::string& native_bridge_library_filename) { - android::LoadNativeBridge(native_bridge_library_filename.c_str(), &native_bridge_art_callbacks_); +bool LoadNativeBridge(std::string& native_bridge_library_filename) { VLOG(startup) << "Runtime::Setup native bridge library: " << (native_bridge_library_filename.empty() ? "(empty)" : native_bridge_library_filename); + return android::LoadNativeBridge(native_bridge_library_filename.c_str(), + &native_bridge_art_callbacks_); } void PreInitializeNativeBridge(std::string dir) { -- cgit v1.1