Fix build break due to missing aarch64 components for x86.

Bug: 21702374

Intel's recent patches for AArch64 support on Intel devices broke fugu,
because they are using the same FORCE_BUILD_ARM define for both 32-bit
and 64-bit.

Change-Id: I4a37e719c9ad8773a653ec4114937eb13b1a0773

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 04a504c..3d7ca40 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -127,6 +127,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
 
 ifeq ($(BUILD_ARM_FOR_X86),true)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_aarch64_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries)
 endif