commit 824ad7954624f61b1c88ca07d96a8270148fe08e
author Razvan Musaloiu-E <razvanm@google.com> Tue Jun 21 21:10:17 2016 -0700
committer Razvan Musaloiu-E <razvanm@google.com> Tue Jun 21 21:10:17 2016 -0700
tree ececb68bc5db54014c694b66ad21971d9f2c7b73
parent 67964a6488ece67a7811325caf9057a853716457

java: Move the loadLibrary for syncbase inside the init

Syncbase.init is the place we want the loading of the syncbase library
to take place. Until now, we had it outside. This change fixes that.

Change-Id: I41e5a239ebf61810f6ec5fd7ad07fa1bf2a1ba40

syncbase/src/androidTest/java/io/v/syncbase/internal/InitTestInstrumented.java

diff --git a/syncbase/src/androidTest/java/io/v/syncbase/internal/InitTestInstrumented.java b/syncbase/src/androidTest/java/io/v/syncbase/internal/InitTestInstrumented.java
index 983be49..4d0e38d 100644
--- a/syncbase/src/androidTest/java/io/v/syncbase/internal/InitTestInstrumented.java
+++ b/syncbase/src/androidTest/java/io/v/syncbase/internal/InitTestInstrumented.java
@@ -23,7 +23,6 @@
 public class InitTestInstrumented {
     @Test
     public void init() throws Exception {
-        System.loadLibrary("syncbase");
         Syncbase.Options opts = new Syncbase.Options();
         opts.rootDir = InstrumentationRegistry.getContext()
                 .getDir("syncbase", Context.MODE_PRIVATE).getAbsolutePath();

syncbase/src/main/java/io/v/syncbase/Syncbase.java

diff --git a/syncbase/src/main/java/io/v/syncbase/Syncbase.java b/syncbase/src/main/java/io/v/syncbase/Syncbase.java
index 1d0a0a3..4dfd45c 100644
--- a/syncbase/src/main/java/io/v/syncbase/Syncbase.java
+++ b/syncbase/src/main/java/io/v/syncbase/Syncbase.java
@@ -101,6 +101,7 @@
      * @param opts
      */
     public static void init(Options opts) throws VError {
+        System.loadLibrary("syncbase");
         sOpts = opts;
         io.v.syncbase.internal.Service.Init(sOpts.rootDir, sOpts.testLogin);
         if (isLoggedIn()) {

syncbase/src/test/java/io/v/syncbase/SyncbaseTest.java

diff --git a/syncbase/src/test/java/io/v/syncbase/SyncbaseTest.java b/syncbase/src/test/java/io/v/syncbase/SyncbaseTest.java
index 3b8d988..bbf77d0 100644
--- a/syncbase/src/test/java/io/v/syncbase/SyncbaseTest.java
+++ b/syncbase/src/test/java/io/v/syncbase/SyncbaseTest.java
@@ -36,7 +36,6 @@
     // -Djava.library.path=/Users/sadovsky/vanadium/release/java/syncbase/build/libs
     @Before
     public void setUp() throws Exception {
-        System.loadLibrary("syncbase");
         Syncbase.Options opts = new Syncbase.Options();
         opts.rootDir = folder.newFolder().getAbsolutePath();
         opts.disableUserdataSyncgroup = true;