Ensure arch/generic.c is always included in libclcore_g.bc.
This fixes a bug where the symbols contained in generic.c were not
accessible when running on x86_64 or MIPS64. That led to the linking
of apks on the device to fail.
Change-Id: Ic10cba73bcc229ec00a558f0eb6ef862aaa9096c
Signed-off-by: Verena Beckham <[email protected]>
(cherry picked from commit 39d95077c0fa1ab04739ec60a79eb8d9386242d0)
Bug: 30312793
diff --git a/driver/runtime/Android.mk b/driver/runtime/Android.mk
index 49bc321..5a04c2d 100755
--- a/driver/runtime/Android.mk
+++ b/driver/runtime/Android.mk
@@ -44,7 +44,8 @@
arch/generic.c
clcore_g_files := \
- rs_abi_debuginfo.c
+ rs_abi_debuginfo.c \
+ arch/generic.c
clcore_files_32 := \
$(clcore_base_files_32) \
@@ -150,11 +151,9 @@
LOCAL_CFLAGS += $(clcore_cflags)
LOCAL_CFLAGS += -g -O0
LOCAL_SRC_FILES := $(clcore_base_files) $(clcore_g_files)
-LOCAL_SRC_FILES_32 := arch/generic.c
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64))
LOCAL_CFLAGS_64 += -DARCH_ARM64_HAVE_NEON
-LOCAL_SRC_FILES_64 := arch/generic.c
endif
include $(LOCAL_PATH)/build_bc_lib.mk
