diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 02:00:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 02:00:45 +0000 |
| commit | 4a0a4760bb8294838911c9e3803f282873755fac (patch) | |
| tree | 94ac7a195544638b64cad5eb997f8d008b2a9b3a | |
| parent | 3943f5d657cf529c27efd8c50acc897e7ead4698 (diff) | |
| parent | b651c29d26b5262737ae98815405a39c05a9c24b (diff) | |
| download | mclinker-4a0a4760bb8294838911c9e3803f282873755fac.tar.gz | |
Merge "Enable 64-bit linking on arm" am: b651c29d26
Change-Id: I6799b6d1abe3aa92358ddd19c03bf969ff85938a
| -rw-r--r-- | tools/mcld/Android.bp | 3 |
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 |