Fix merge conflicts

2018-06-19 15:31:33 +01:00
parent 7405cd268a
commit 88a6cff373
45 changed files with 14 additions and 6368 deletions
--- a/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
+++ b/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
@@ -35,7 +35,7 @@ public class SonarSampleApplication extends Application {
    SoLoader.init(this, false);
    try {
        //SoLoader.loadLibrary("sonarfb");
-        System.loadLibrary("sonarcpp");
+        SoLoader.loadLibrary("sonarfb");
    } catch (Exception e) {
        throw new RuntimeException(e);
    }