From f1d28c9da38a5fd8b83a41ee14e814f589c7517d Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Fri, 13 Oct 2023 10:41:49 +0200 Subject: add libcpp to vndk Signed-off-by: Mattijs Korpershoek --- subprojects/packagefiles/vndk/meson.build | 10 ++++++++++ subprojects/vndk.wrap | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/subprojects/packagefiles/vndk/meson.build b/subprojects/packagefiles/vndk/meson.build index dbc7eda6..9814b27b 100644 --- a/subprojects/packagefiles/vndk/meson.build +++ b/subprojects/packagefiles/vndk/meson.build @@ -42,3 +42,13 @@ 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')) +meson.override_dependency('cpp_stdlib', vndk_libcpp_dep) diff --git a/subprojects/vndk.wrap b/subprojects/vndk.wrap index b7a0d3f0..0a70c1b0 100644 --- a/subprojects/vndk.wrap +++ b/subprojects/vndk.wrap @@ -9,4 +9,4 @@ depth = 1 patch_directory = vndk [provide] -dependency_names = libhardware, libui +dependency_names = libhardware, libui, vndk_libcpp -- cgit v1.2.1