From c9ecc999f463eb21a68fe0d558cf73224982006c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 14 Jun 2021 16:10:52 -0700 Subject: Move ndk_libandroid_support headers out of libc++ A change to the ordering of arch-specific export_include_dirs headers like multilib.lib32.export_include_headers used in libc++ makes the relative ordering of the libc++ headers and the libandroid_support headers incorrect with this workaround. Move the headers back to ndk_libandroid_support, and ensure ndk_libandroid_support is always after ndk_libc++_static or ndk_libc++_shared in the dependency ordering instead. Test: m checkbuild Change-Id: I73df437c6cec4a1f91531391f498ca45219effbe --- Android.bp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Android.bp b/Android.bp index dba243ef7..62493b4d0 100644 --- a/Android.bp +++ b/Android.bp @@ -38,10 +38,9 @@ libcxx_includes = [ ndk_prebuilt_static_stl { name: "ndk_libandroid_support", - // libandroid_support headers are exported by libc++ rather than by - // libandroid_support itself because it's the only way we can enforce the - // correct ordering of the includes (libc++ first, libandroid_support - // second). + export_include_dirs: [ + "current/sources/android/support/include", + ], arch: { arm64: { enabled: false, @@ -65,13 +64,6 @@ ndk_prebuilt_static_stl { ndk_prebuilt_static_stl { name: "ndk_libc++_static", export_include_dirs: libcxx_includes, - multilib: { - lib32: { - export_include_dirs: [ - "current/sources/android/support/include", - ], - }, - }, min_sdk_version: "16", } -- cgit v1.2.3