summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2020-01-30 14:17:46 -0800
committerMiao Wang <miaowang@google.com>2020-01-30 23:19:18 +0000
commit2070f649ba12c911c1dd94535e2a20320453469b (patch)
tree94ac7a195544638b64cad5eb997f8d008b2a9b3a
parente262086a37bb2a9c8fbd99804077fa915a0a1920 (diff)
downloadmclinker-2070f649ba12c911c1dd94535e2a20320453469b.tar.gz
Enable 64-bit linking on arm
Bug: 138266211 Test: mm Test: 64bit RS app compiles well with 32bit bcc Change-Id: Ie94035780355b85d4959bbf4909ddac3db51b17c
-rw-r--r--tools/mcld/Android.bp3
1 files changed, 2 insertions, 1 deletions
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 @@ cc_binary {
// 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