jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename libsonar* to libflipper*

Browse Source 
Summary: Rename the native libraries.

Reviewed By: priteshrnandgaonkar

Differential Revision: D10009245

fbshipit-source-id: 987c4fdb1acc21abbbecfb3db8a672f4aa4e499d
This commit is contained in:
Pascal Hartig
2018-09-25 03:46:57 -07:00
committed by Facebook Github Bot
parent b78c703bdb
commit c7b0d419cb
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
cmake_minimum_required (VERSION 3.6.0) cmake_minimum_required (VERSION 3.6.0)
project(sonar CXX) project(flipper CXX)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
set(PACKAGE_NAME "sonar") set(PACKAGE_NAME "flipper")
add_compile_options(-DFLIPPER_OSS=1 add_compile_options(-DFLIPPER_OSS=1
-DFOLLY_NO_CONFIG -DFOLLY_NO_CONFIG
@@ -32,7 +32,7 @@ target_include_directories(${PACKAGE_NAME} PUBLIC "./")
set(libjnihack_DIR ${CMAKE_SOURCE_DIR}/../libs/jni-hack/) set(libjnihack_DIR ${CMAKE_SOURCE_DIR}/../libs/jni-hack/)
set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/) set(libfbjni_DIR ${CMAKE_SOURCE_DIR}/../libs/fbjni/)
set(libsonar_DIR ${CMAKE_SOURCE_DIR}/../xplat/) set(libflipper_DIR ${CMAKE_SOURCE_DIR}/../xplat/)
set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external) set(external_DIR ${PROJECT_SOURCE_DIR}/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/) set(libfolly_DIR ${external_DIR}/folly/)
set(glog_DIR ${external_DIR}/glog) set(glog_DIR ${external_DIR}/glog)
@@ -42,12 +42,12 @@ set(LIBEVENT_DIR ${external_DIR}/LibEvent/libevent-release-2.1.9/)
set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(build_DIR ${CMAKE_SOURCE_DIR}/build)
set(fbjni_build_DIR ${build_DIR}/fbjni/${ANDROID_ABI}) set(fbjni_build_DIR ${build_DIR}/fbjni/${ANDROID_ABI})
set(libsonar_build_DIR ${build_DIR}/libsonar/${ANDROID_ABI}) set(libflipper_build_DIR ${build_DIR}/libflipper/${ANDROID_ABI})
set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI}) set(libfolly_build_DIR ${build_DIR}/libfolly/${ANDROID_ABI})
file(MAKE_DIRECTORY ${build_DIR}) file(MAKE_DIRECTORY ${build_DIR})
add_subdirectory(${libsonar_DIR} ${libsonar_build_DIR}) add_subdirectory(${libflipper_DIR} ${libflipper_build_DIR})
add_subdirectory(${libfbjni_DIR} ${fbjni_build_DIR}) add_subdirectory(${libfbjni_DIR} ${fbjni_build_DIR})
target_include_directories(${PACKAGE_NAME} PRIVATE target_include_directories(${PACKAGE_NAME} PRIVATE
@@ -56,7 +56,7 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
${libfbjni_DIR}/cxx/fbjni ${libfbjni_DIR}/cxx/fbjni
${libfbjni_DIR}/cxx/fbjni/detail ${libfbjni_DIR}/cxx/fbjni/detail
${libfbjni_DIR}/cxx/lyra ${libfbjni_DIR}/cxx/lyra
${libsonar_DIR} ${libflipper_DIR}
${libfolly_DIR} ${libfolly_DIR}
${glog_DIR} ${glog_DIR}
${glog_DIR}/../ ${glog_DIR}/../
@@ -68,4 +68,4 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2
) )
target_link_libraries(${PACKAGE_NAME} sonarfb sonarcpp) target_link_libraries(${PACKAGE_NAME} flipperfb flippercpp)

2
android/build.gradle
View File

@@ -17,7 +17,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared'
targets 'sonar', 'event', 'event_extra', 'event_core' targets 'flipper', 'event', 'event_extra', 'event_core'
} }
} }
} }

2
android/src/main/java/com/facebook/flipper/android/EventBase.java
View File

@@ -16,7 +16,7 @@ import com.facebook.flipper.BuildConfig;
class EventBase extends HybridClassBase { class EventBase extends HybridClassBase {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("flipper");
} }
} }

2
android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
View File

@@ -20,7 +20,7 @@ import com.facebook.flipper.core.StateSummary;
class FlipperClientImpl implements FlipperClient { class FlipperClientImpl implements FlipperClient {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("flipper");
} }
} }

2
android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
View File

@@ -20,7 +20,7 @@ import com.facebook.flipper.core.FlipperReceiver;
class FlipperConnectionImpl implements FlipperConnection { class FlipperConnectionImpl implements FlipperConnection {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("flipper");
} }
} }

2
android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
View File

@@ -19,7 +19,7 @@ import com.facebook.flipper.core.FlipperResponder;
class FlipperResponderImpl implements FlipperResponder { class FlipperResponderImpl implements FlipperResponder {
static { static {
if (BuildConfig.IS_INTERNAL_BUILD) { if (BuildConfig.IS_INTERNAL_BUILD) {
SoLoader.loadLibrary("sonar"); SoLoader.loadLibrary("flipper");
} }
} }

2
libs/fbjni/CMakeLists.txt
View File

@@ -6,7 +6,7 @@
# #
cmake_minimum_required(VERSION 3.6.0) cmake_minimum_required(VERSION 3.6.0)
set(PACKAGE_NAME "sonarfb") set(PACKAGE_NAME "flipperfb")
project(${PACKAGE_NAME} CXX) project(${PACKAGE_NAME} CXX)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)

4
xplat/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.6.0) cmake_minimum_required (VERSION 3.6.0)
project(sonarcpp CXX) project(flippercpp CXX)
set(CMAKE_VERBOSE_MAKEFILE on) set(CMAKE_VERBOSE_MAKEFILE on)
set(PACKAGE_NAME sonarcpp) set(PACKAGE_NAME flippercpp)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(RSOCKET_VERSION 0.10.3) set(RSOCKET_VERSION 0.10.3)