summaryrefslogtreecommitdiff
path: root/subprojects/packagefiles
diff options
context:
space:
mode:
authorMattijs Korpershoek <mkorpershoek@baylibre.com>2023-10-13 10:52:27 +0200
committerMattijs Korpershoek <mkorpershoek@baylibre.com>2023-10-13 16:49:23 +0200
commita7744d911cfd67fb04d24748bb952f5ba65cba14 (patch)
tree27f6f833b53f6a9eaf13bbff2bc16642d5dfca04 /subprojects/packagefiles
parent44fda62974569aac0fb33592b6482bd52a43933c (diff)
cxx_abi to STL
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Diffstat (limited to 'subprojects/packagefiles')
-rw-r--r--subprojects/packagefiles/vndk/meson.build15
1 files 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