Move `glog` to be consumed via prefab

Summary:
This removes the old way of consuming `libglog.so` from
`Android-prebuilt.cmake` to using Prefab which is natively supported
by the Android pipeline.

Changelog:
[Internal] [Changed] - Move `glog` to be consumed via prefab

Reviewed By: cipolleschi

Differential Revision: D39927147

fbshipit-source-id: 99f0241da1dece0efc8d928c3d25f30f3fa48a09
This commit is contained in:
Nicola Corti 2022-09-29 07:08:21 -07:00 коммит произвёл Facebook GitHub Bot
Родитель 277a64f03e
Коммит 3e5b9d4f5e
3 изменённых файлов: 11 добавлений и 10 удалений

Просмотреть файл

@ -108,6 +108,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
new PrefabPreprocessingEntry( new PrefabPreprocessingEntry(
"jsi", "jsi",
new Pair("../ReactCommon/jsi/", "") new Pair("../ReactCommon/jsi/", "")
),
new PrefabPreprocessingEntry(
"glog",
new Pair(new File(buildDir, "third-party-ndk/glog/exported/").absolutePath, "")
) )
] ]
) )
@ -373,7 +377,8 @@ android {
"react_render_core", "react_render_core",
"react_render_graphics", "react_render_graphics",
"rrc_view", "rrc_view",
"jsi" "jsi",
"glog"
} }
} }
ndk { ndk {
@ -477,6 +482,9 @@ android {
jsi { jsi {
headers(new File(prefabHeadersDir, "jsi").absolutePath) headers(new File(prefabHeadersDir, "jsi").absolutePath)
} }
glog {
headers(new File(prefabHeadersDir, "glog").absolutePath)
}
} }
publishing { publishing {

Просмотреть файл

@ -61,14 +61,6 @@ target_compile_options(folly_runtime
-DFOLLY_MOBILE=1 -DFOLLY_MOBILE=1
-DFOLLY_HAVE_XSI_STRERROR_R=1) -DFOLLY_HAVE_XSI_STRERROR_R=1)
## glog
add_library(glog SHARED IMPORTED GLOBAL)
set_target_properties(glog
PROPERTIES
IMPORTED_LOCATION
${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libglog.so)
target_include_directories(glog INTERFACE ${THIRD_PARTY_NDK_DIR}/glog/exported)
## yoga ## yoga
add_library(yoga SHARED IMPORTED GLOBAL) add_library(yoga SHARED IMPORTED GLOBAL)
set_target_properties(yoga set_target_properties(yoga

Просмотреть файл

@ -52,12 +52,13 @@ add_library(react_render_core ALIAS ReactAndroid::react_render_core)
add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics) add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics)
add_library(rrc_view ALIAS ReactAndroid::rrc_view) add_library(rrc_view ALIAS ReactAndroid::rrc_view)
add_library(jsi ALIAS ReactAndroid::jsi) add_library(jsi ALIAS ReactAndroid::jsi)
add_library(glog ALIAS ReactAndroid::glog)
target_link_libraries(${CMAKE_PROJECT_NAME} target_link_libraries(${CMAKE_PROJECT_NAME}
fabricjni fabricjni
fbjni fbjni
folly_runtime folly_runtime
glog glog # prefab ready
jsi # prefab ready jsi # prefab ready
react_codegen_rncore # prefab ready react_codegen_rncore # prefab ready
react_debug # prefab ready react_debug # prefab ready