From a7744d911cfd67fb04d24748bb952f5ba65cba14 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Fri, 13 Oct 2023 10:52:27 +0200 Subject: cxx_abi to STL Signed-off-by: Mattijs Korpershoek --- subprojects/packagefiles/vndk/meson.build | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/subprojects/packagefiles/vndk/meson.build b/subprojects/packagefiles/vndk/meson.build index 1d784731..40428ba4 100644 --- a/subprojects/packagefiles/vndk/meson.build +++ b/subprojects/packagefiles/vndk/meson.build @@ -43,14 +43,15 @@ libui_dep = declare_dependency( include_directories : include_directories(include_base / 'frameworks/native/libs/ui/include_vndk')) meson.override_dependency('libui', libui_dep) -deps_cpp = [ - cxx.find_library('c++', dirs : prebuild_libraries), - cxx.find_library('c', dirs : prebuild_libraries), -] - vndk_libcpp_dep = declare_dependency( - dependencies : deps_cpp, - include_directories : include_directories(include_base / 'external/libcxx/include')) + dependencies : [ + cxx.find_library('c++', dirs : prebuild_libraries), + cxx.find_library('c', dirs : prebuild_libraries), + ], + include_directories : [ + include_directories(include_base / 'external/libcxx/include'), + include_directories(include_base / 'external/libcxxabi/include'), + ]) meson.override_dependency('cpp_stdlib', vndk_libcpp_dep) # TODO: add libexif, libjpeg and libyuv -- cgit v1.2.1