Merge RP1A.200204.001
Change-Id: I3646505164f7b97662e0472fd8eafbe167a14dc1
diff --git a/tools/mcld/Android.bp b/tools/mcld/Android.bp
index ec9d7d4..9e6cc8a 100644
--- a/tools/mcld/Android.bp
+++ b/tools/mcld/Android.bp
@@ -60,7 +60,8 @@
// Add target specific code generation libraries
android_arm: {
- static_libs: MCLD_ARM_LIBS,
+ // Include AARCH64 libs to enable 64-bit linking on ARM targets
+ static_libs: MCLD_ARM_LIBS + MCLD_AARCH64_LIBS,
},
android_arm64: {
// Include ARM libs to enable 32-bit linking on AARCH64 targets