From ffa6e744c20906c7c2e2d01223a920b55e7eadb7 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Tue, 19 Jun 2018 14:08:12 +0100
Subject: [PATCH] update

---
 .../facebook/sonar/sample/SonarSampleApplication.java    | 3 ++-
 libs/fbjni/CMakeLists.txt                                | 9 +++++++--
 libs/fbjni/java/com/facebook/jni/HybridData.java         | 2 +-
 libs/fbjni/java/com/facebook/jni/ThreadScopeSupport.java | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java b/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
index 69fd47cf0..0be41db61 100644
--- a/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
+++ b/android/sample/src/sonar/com/facebook/sonar/sample/SonarSampleApplication.java
@@ -34,7 +34,8 @@ public class SonarSampleApplication extends Application {
     super.onCreate();
     SoLoader.init(this, false);
     try {
-        SoLoader.loadLibrary("sonarfb");
+        //SoLoader.loadLibrary("sonarfb");
+        System.loadLibrary("sonarcpp");
     } catch (Exception e) {
         throw new RuntimeException(e);
     }
diff --git a/libs/fbjni/CMakeLists.txt b/libs/fbjni/CMakeLists.txt
index 9cdc87ff3..97018a56f 100644
--- a/libs/fbjni/CMakeLists.txt
+++ b/libs/fbjni/CMakeLists.txt
@@ -14,8 +14,11 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 add_compile_options(
     -fno-omit-frame-pointer
     -fexceptions
+    -O3
     -Wall
     -std=c++11
+    -frtti
+    -ffunction-sections
     -DDISABLE_CPUCAP
     -DDISABLE_XPLAT)
 
@@ -25,14 +28,16 @@ list(APPEND FBJNI_HDRS ${FBJNI_CXX})
 list(APPEND FBJNI_HDRS ${FBJNI_CXX}/fbjni/)
 list(APPEND FBJNI_HDRS ${FBJNI_CXX}/fbjni/detail)
 list(APPEND FBJNI_HDRS ${FBJNI_CXX}/lyra)
+list(APPEND FBJNI_HDRS ${FBJNI_CXX}/../../jni-hack)
+
 include_directories(${FBJNI_HDRS})
 
 message(STATUS "FBJNI_HDRS =>" ${FBJNI_HDRS})
 file(GLOB FBJNI_SRC
     ${FBJNI_CXX}/fbjni/*.cpp
     ${FBJNI_CXX}/fbjni/detail/*.cpp
-    ${FBJNI_CXX}/lyra/*.cpp)
-
+    ${FBJNI_CXX}/lyra/*.cpp
+    )
 
 add_library(${PACKAGE_NAME} SHARED
     ${FBJNI_SRC})
diff --git a/libs/fbjni/java/com/facebook/jni/HybridData.java b/libs/fbjni/java/com/facebook/jni/HybridData.java
index 3070e0f62..8a750bece 100644
--- a/libs/fbjni/java/com/facebook/jni/HybridData.java
+++ b/libs/fbjni/java/com/facebook/jni/HybridData.java
@@ -31,7 +31,7 @@ import com.facebook.soloader.SoLoader;
 public class HybridData {
 
   static {
-    SoLoader.loadLibrary("fb");
+    SoLoader.loadLibrary("sonarfb");
   }
 
   @DoNotStrip private Destructor mDestructor = new Destructor(this);
diff --git a/libs/fbjni/java/com/facebook/jni/ThreadScopeSupport.java b/libs/fbjni/java/com/facebook/jni/ThreadScopeSupport.java
index be04e4e62..82ed31ce4 100644
--- a/libs/fbjni/java/com/facebook/jni/ThreadScopeSupport.java
+++ b/libs/fbjni/java/com/facebook/jni/ThreadScopeSupport.java
@@ -22,7 +22,7 @@ import com.facebook.soloader.SoLoader;
 @DoNotStrip
 public class ThreadScopeSupport {
   static {
-    SoLoader.loadLibrary("fbjni");
+    SoLoader.loadLibrary("sonarfb");
   }
 
   // This is just used for ThreadScope::withClassLoader to have a java function