diff options
| author | Victor Khimenko <khim@google.com> | 2016-10-28 16:54:50 +0200 |
|---|---|---|
| committer | Victor Khimenko <khim@google.com> | 2016-10-28 16:55:52 +0200 |
| commit | 2a88e79bf937fc4a83ec52b75ef6e6f49a5c9d0b (patch) | |
| tree | 36c8a089c047fd2935bbce88144a2d01950d27f0 /cpu_ref | |
| parent | 11ea8f00fcd6d2f4530e905e3d4333a88fa33d04 (diff) | |
| download | rs-2a88e79bf937fc4a83ec52b75ef6e6f49a5c9d0b.tar.gz | |
Fix x86+arm multilib branch
Don't add -DARCH_X86_HAVE_SSSE3 to LOCAL_CFLAGS because otherwise in
x86+arm multilib build RenderScript will try to compile SSSE3 support
on ARM platform. That does not work for obvious reason.
Test: Build renderscript in aosp_x86_arm with SSSE3 and NEON both enabled
Change-Id: Ib4b7271d776353c5cf7277c871942c2f2f7c3985
Diffstat (limited to 'cpu_ref')
| -rw-r--r-- | cpu_ref/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk index 5a7194af..a5fc95f3 100644 --- a/cpu_ref/Android.mk +++ b/cpu_ref/Android.mk @@ -71,8 +71,11 @@ ifeq ($(ARCH_ARM_HAVE_VFP),true) endif ifeq ($(ARCH_X86_HAVE_SSSE3),true) - LOCAL_CFLAGS += -DARCH_X86_HAVE_SSSE3 - LOCAL_SRC_FILES+= \ + LOCAL_CFLAGS_x86 += -DARCH_X86_HAVE_SSSE3 + LOCAL_SRC_FILES_x86 += \ + rsCpuIntrinsics_x86.cpp + LOCAL_CFLAGS_x86_64 += -DARCH_X86_HAVE_SSSE3 + LOCAL_SRC_FILES_x86_64 += \ rsCpuIntrinsics_x86.cpp endif |