commit b837262a9648128ed708d50c27b0d501baf90cfd
author Stephen Hines <srhines@google.com> Wed May 01 16:41:51 2013 -0700
committer Stephen Hines <srhines@google.com> Wed May 01 16:41:51 2013 -0700
tree 3d1c65af42d6823b0d299d913b9ccefd5d49bfe7
parent 2a8abe7dc51c247f8abda8bd818c14d4d570d1ac

Disable NEON on cortex-a15 temporarily.

Bug: 8530053
Change-Id: I4a13638fbdbefe5bb8063981a7bc3b08c972edbc

Android.mk

diff --git a/Android.mk b/Android.mk
index 5266f4f..49948b5 100755
--- a/Android.mk
+++ b/Android.mk
@@ -62,8 +62,11 @@
   $(call intermediates-dir-for,SHARED_LIBRARIES,libclcore_debug.bc,,)/libclcore_debug.bc
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-libbcc_SHA1_SRCS += \
-  $(call intermediates-dir-for,SHARED_LIBRARIES,libclcore_neon.bc,,)/libclcore_neon.bc
+  # Disable NEON on cortex-a15 temporarily
+  ifneq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+    libbcc_SHA1_SRCS += \
+      $(call intermediates-dir-for,SHARED_LIBRARIES,libclcore_neon.bc,,)/libclcore_neon.bc
+  endif
 endif
 
 libbcc_GEN_SHA1_STAMP := $(LOCAL_PATH)/tools/build/gen-sha1-stamp.py
@@ -128,7 +131,10 @@
 endif
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_REQUIRED_MODULES += libclcore_neon.bc
+  # Disable NEON on cortex-a15 temporarily
+  ifneq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+    LOCAL_REQUIRED_MODULES += libclcore_neon.bc
+  endif
 endif
 
 # Generate build information (Build time + Build git revision + Build Semi SHA1)

lib/Renderscript/runtime/Android.mk

diff --git a/lib/Renderscript/runtime/Android.mk b/lib/Renderscript/runtime/Android.mk
index f5c912b..08cefb6 100755
--- a/lib/Renderscript/runtime/Android.mk
+++ b/lib/Renderscript/runtime/Android.mk
@@ -102,11 +102,14 @@
 
 # Build a NEON-enabled version of the library (if possible)
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libclcore_neon.bc
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := $(clcore_neon_files)
+# Disable NEON on cortex-a15 temporarily
+ifneq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+  include $(CLEAR_VARS)
+  LOCAL_MODULE := libclcore_neon.bc
+  LOCAL_MODULE_TAGS := optional
+  LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+  LOCAL_SRC_FILES := $(clcore_neon_files)
 
-include $(LOCAL_PATH)/build_bc_lib.mk
+  include $(LOCAL_PATH)/build_bc_lib.mk
+endif
 endif

libbcc-device-build.mk

diff --git a/libbcc-device-build.mk b/libbcc-device-build.mk
index 7cf635f..aead9c1 100644
--- a/libbcc-device-build.mk
+++ b/libbcc-device-build.mk
@@ -43,7 +43,10 @@
     endif
   endif
   ifeq ($(ARCH_ARM_HAVE_NEON),true)
-    LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON
+    # Disable NEON on cortex-a15 temporarily
+    ifneq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+      LOCAL_CFLAGS += -DARCH_ARM_HAVE_NEON
+    endif
   endif
 else
   ifeq ($(TARGET_ARCH),mips)