From 69c72cf1ae966f4fae3013d50a683ab3025c08e6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 26 Jan 2023 14:06:41 -0800 Subject: [PATCH] Build sdk variants of libc++ for riscv64 There is no prebuilt libc++ for riscv64 provided by the NDK, build it using the platform sources instead. Test: lunch aosp_riscv64-userdebug && m -k bbg Change-Id: I3e443925549d04edebc9adc56116c5254dbf4307 --- Android.bp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Android.bp b/Android.bp index 648a7dfde..519101739 100644 --- a/Android.bp +++ b/Android.bp @@ -96,6 +96,10 @@ cc_library_static { ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", + // sdk_version normally isn't needed as only the platform variant + // is used, except on riscv64 which doesn't have an NDK libc++ and + // reuses this module for sdk variants. + sdk_version: "current", native_bridge_supported: true, srcs: [ "src/algorithm.cpp", @@ -161,6 +165,10 @@ cc_library_shared { ], // being part of updatable apexes, this should work on older releases min_sdk_version: "apex_inherit", + // sdk_version normally isn't needed as only the platform variant + // is used, except on riscv64 which doesn't have an NDK libc++ and + // reuses this module for sdk variants. + sdk_version: "current", whole_static_libs: ["libc++_static"], stl: "none",