diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index e7f0aba6..b696d8de 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -131,7 +131,7 @@ add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL) set_target_properties(tbbmalloc_proxy PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a ) -set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) +set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb) list(APPEND CC_EXTERNAL_LIBS freetype diff --git a/android/arm64-v8a/libtbb_static.a b/android/arm64-v8a/libtbb_static.a index 84e38b30..09036cc6 100644 Binary files a/android/arm64-v8a/libtbb_static.a and b/android/arm64-v8a/libtbb_static.a differ diff --git a/android/arm64-v8a/libtbbmalloc_proxy_static.a b/android/arm64-v8a/libtbbmalloc_proxy_static.a index 14a31d38..a923532c 100644 Binary files a/android/arm64-v8a/libtbbmalloc_proxy_static.a and b/android/arm64-v8a/libtbbmalloc_proxy_static.a differ diff --git a/android/arm64-v8a/libtbbmalloc_static.a b/android/arm64-v8a/libtbbmalloc_static.a index bb654f44..de242e82 100644 Binary files a/android/arm64-v8a/libtbbmalloc_static.a and b/android/arm64-v8a/libtbbmalloc_static.a differ diff --git a/android/armeabi-v7a/libtbb_static.a b/android/armeabi-v7a/libtbb_static.a index 5ffb51e1..670787f0 100644 Binary files a/android/armeabi-v7a/libtbb_static.a and b/android/armeabi-v7a/libtbb_static.a differ diff --git a/android/armeabi-v7a/libtbbmalloc_proxy_static.a b/android/armeabi-v7a/libtbbmalloc_proxy_static.a index 0603c464..a6eaed6e 100644 Binary files a/android/armeabi-v7a/libtbbmalloc_proxy_static.a and b/android/armeabi-v7a/libtbbmalloc_proxy_static.a differ diff --git a/android/armeabi-v7a/libtbbmalloc_static.a b/android/armeabi-v7a/libtbbmalloc_static.a index d72593a9..db619faf 100644 Binary files a/android/armeabi-v7a/libtbbmalloc_static.a and b/android/armeabi-v7a/libtbbmalloc_static.a differ diff --git a/android/x86/libtbb_static.a b/android/x86/libtbb_static.a index 411b0df7..47fba917 100644 Binary files a/android/x86/libtbb_static.a and b/android/x86/libtbb_static.a differ diff --git a/android/x86/libtbbmalloc_proxy_static.a b/android/x86/libtbbmalloc_proxy_static.a index 9d02dc47..fd347c74 100644 Binary files a/android/x86/libtbbmalloc_proxy_static.a and b/android/x86/libtbbmalloc_proxy_static.a differ diff --git a/android/x86/libtbbmalloc_static.a b/android/x86/libtbbmalloc_static.a index 38a7305b..4dfa8c4e 100644 Binary files a/android/x86/libtbbmalloc_static.a and b/android/x86/libtbbmalloc_static.a differ diff --git a/mac/libs/libtbb_static.a b/mac/libs/libtbb_static.a new file mode 100644 index 00000000..791b7196 Binary files /dev/null and b/mac/libs/libtbb_static.a differ diff --git a/mac/libs/libtbbmalloc_proxy_static.a b/mac/libs/libtbbmalloc_proxy_static.a new file mode 100644 index 00000000..c4672c59 Binary files /dev/null and b/mac/libs/libtbbmalloc_proxy_static.a differ diff --git a/mac/libs/libtbbmalloc_static.a b/mac/libs/libtbbmalloc_static.a new file mode 100644 index 00000000..7d869ffa Binary files /dev/null and b/mac/libs/libtbbmalloc_static.a differ