Build sdk variants of libc++ for riscv64 am: 69c72cf1ae am: b44510800b
Original change: https://android-review.googlesource.com/c/platform/external/libcxx/+/2404996
Change-Id: Iccd541a99cb23370c16c9621867452af8b243fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 648a7df..5191017 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,6 +96,10 @@
],
// 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 @@
],
// 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",