From 4cbaeb3e32373b21a454580c589f20668b807341 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Fri, 15 Jun 2018 16:53:58 +0100
Subject: [PATCH] =?UTF-8?q?Android=20target=20and=20sample=20builds=20?=
 =?UTF-8?q?=F0=9F=91=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/CMakeLists.txt      | 12 ++++++++----
 android/android/sonar.cpp   | 12 ++++++++----
 android/sample/build.gradle |  1 -
 libs/fbjni/CMakeLists.txt   |  6 ++++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 6d732a3c6..427c4f0fb 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -6,7 +6,8 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 set(PACKAGE_NAME      "sonar")
 
-add_compile_options(-DFOLLY_NO_CONFIG
+add_compile_options(-DSONAR_OSS=1
+                    -DFOLLY_NO_CONFIG
                     -DSONAR_JNI_EXTERNAL=1
                     -DFB_SONARKIT_ENABLED=1
                     -DFOLLY_HAVE_MEMRCHR
@@ -30,7 +31,7 @@ add_library(${PACKAGE_NAME} SHARED ${SOURCES})
 target_include_directories(${PACKAGE_NAME}  PUBLIC "./")
 
 set(libjnihack_DIR ${CMAKE_SOURCE_DIR}/../libs/jni-hack/)
-set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/src/main/cpp/include/)
+set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/)
 set(libsonar_DIR ${CMAKE_SOURCE_DIR}/../xplat/)
 set(third_party_ndk ${PROJECT_SOURCE_DIR}/build/third-party-ndk)
 set(libfolly_DIR ${third_party_ndk}/folly/)
@@ -48,11 +49,14 @@ set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
 file(MAKE_DIRECTORY ${build_DIR})
 
 add_subdirectory(${libsonar_DIR} ${libsonar_build_DIR})
-add_subdirectory(${libfbjni_DIR}/../ ${fbjni_build_DIR})
+add_subdirectory(${libfbjni_DIR} ${fbjni_build_DIR})
 
 target_include_directories(${PACKAGE_NAME} PRIVATE
     ${libjnihack_DIR}
-    ${libfbjni_DIR}
+    ${libfbjni_DIR}/cxx/
+    ${libfbjni_DIR}/cxx/fbjni
+    ${libfbjni_DIR}/cxx/fbjni/detail
+    ${libfbjni_DIR}/cxx/lyra
     ${libsonar_DIR}
     ${libfolly_DIR}
     ${glog_DIR}
diff --git a/android/android/sonar.cpp b/android/android/sonar.cpp
index f7a279e57..874c91774 100644
--- a/android/android/sonar.cpp
+++ b/android/android/sonar.cpp
@@ -8,7 +8,11 @@
 
 #include <memory>
 
+#ifdef SONAR_OSS
+#include <fbjni/fbjni.h>
+#else
 #include <fb/fbjni.h>
+#endif
 
 #include <folly/json.h>
 #include <folly/io/async/EventBase.h>
@@ -275,10 +279,10 @@ class JSonarClient : public jni::HybridClass<JSonarClient> {
 
     SonarClient::init({
       {
-        std::move(host), 
-        std::move(os), 
-        std::move(device), 
-        std::move(deviceId), 
+        std::move(host),
+        std::move(os),
+        std::move(device),
+        std::move(deviceId),
         std::move(app),
         std::move(appId),
         std::move(privateAppDirectory)
diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index 5d0794a74..daff082f4 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -59,5 +59,4 @@ dependencies {
 
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation project(':android')
-    //implementation project(':sonar')
 }
diff --git a/libs/fbjni/CMakeLists.txt b/libs/fbjni/CMakeLists.txt
index ea30a3aee..ac467d047 100644
--- a/libs/fbjni/CMakeLists.txt
+++ b/libs/fbjni/CMakeLists.txt
@@ -6,6 +6,8 @@
 #
 
 cmake_minimum_required(VERSION 3.6.0)
+set(PACKAGE_NAME      "fb")
+project(${PACKAGE_NAME} CXX)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
@@ -32,10 +34,10 @@ file(GLOB FBJNI_SRC
     ${FBJNI_CXX}/lyra/*.cpp)
 
 
-add_library(fb SHARED
+add_library(${PACKAGE_NAME} SHARED
     ${FBJNI_SRC})
 
 #target_include_directories(fb PRIVATE
 #    include ${libjnihack_DIR})
 
-target_link_libraries(fb log)
+target_link_libraries(${PACKAGE_NAME} log)