summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattijs Korpershoek <mkorpershoek@baylibre.com>2023-10-13 10:41:49 +0200
committerMattijs Korpershoek <mkorpershoek@baylibre.com>2023-10-13 16:31:13 +0200
commitf1d28c9da38a5fd8b83a41ee14e814f589c7517d (patch)
tree4a3c15aaa60b5442897bae9c50d28df6e7917f66
parentd8236944c31c5e48aa7a2cf18cdd702d3ae234f6 (diff)
add libcpp to vndk
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
-rw-r--r--subprojects/packagefiles/vndk/meson.build10
-rw-r--r--subprojects/vndk.wrap2
2 files changed, 11 insertions, 1 deletions
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