diff options
| author | Calin Juravle <calin@google.com> | 2014-10-28 19:09:50 +0000 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2014-10-28 19:09:50 +0000 |
| commit | 4de4e6defce30e7693cea04e9553ee3bb1e72f88 (patch) | |
| tree | 086931f00607277a29531095dde61e1750e7c7d9 /include | |
| parent | 845867b2c2bb373cf253dec7d771870bf2de5e0d (diff) | |
| parent | e3c22c416fb2322d1748f66e3ed2bf6f265a8c68 (diff) | |
| download | system_core-4de4e6defce30e7693cea04e9553ee3bb1e72f88.zip system_core-4de4e6defce30e7693cea04e9553ee3bb1e72f88.tar.gz system_core-4de4e6defce30e7693cea04e9553ee3bb1e72f88.tar.bz2 | |
resolved conflicts for merge of e3c22c41 to stage-aosp-master
Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
Diffstat (limited to 'include')
| -rw-r--r-- | include/nativebridge/native_bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nativebridge/native_bridge.h b/include/nativebridge/native_bridge.h index ac254e9..523dc49 100644 --- a/include/nativebridge/native_bridge.h +++ b/include/nativebridge/native_bridge.h @@ -37,7 +37,7 @@ bool NeedsNativeBridge(const char* instruction_set); // Do the early initialization part of the native bridge, if necessary. This should be done under // high privileges. -void PreInitializeNativeBridge(const char* app_data_dir, const char* instruction_set); +bool PreInitializeNativeBridge(const char* app_data_dir, const char* instruction_set); // Initialize the native bridge, if any. Should be called by Runtime::DidForkFromZygote. The JNIEnv* // will be used to modify the app environment for the bridge. |