commit 97459bde28b2f1aac96a52ac1c1ba38ce492bca0
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sat Feb 15 01:00:27 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sat Feb 15 01:00:27 2020 +0000
tree 94ac7a195544638b64cad5eb997f8d008b2a9b3a
parent ec0e0b38ebda2e95f770826bc57c920439ff71c7
parent 2993f0201ceb07bc2037b1daed538e9517f32f40

Snap for 6209820 from 2993f0201ceb07bc2037b1daed538e9517f32f40 to r-keystone-qcom-release

Change-Id: I5d7863d5f0471dd9e851870f30e6b85bdb4c662a

tools/mcld/Android.bp

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