commit 8392284a70b149a09b25d001d89777af9cdd95df
author Ying Wang <wangying@google.com> Wed Feb 13 10:48:28 2013 -0800
committer Ying Wang <wangying@google.com> Wed Feb 13 10:48:28 2013 -0800
tree 392855b7f4f93d6f99901c98c48de1936083aade
parent cd33a7c8f162e530ba1bcac2d450ca8eef9f7b78

Disable LOCAL_RENDERSCRIPT_COMPATIBILITY for non-arm builds

This fixes the x86 build.

Change-Id: I370063fc83915c4c20cee08cc4feae68c7d7292b

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 02cfad7..a0c2f02 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -196,6 +196,10 @@
 $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC)
 	$(transform-renderscripts-to-java-and-bc)
 
+# Now LOCAL_RENDERSCRIPT_COMPATIBILITY only supports arm
+ifneq ($(TARGET_ARCH),arm)
+LOCAL_RENDERSCRIPT_COMPATIBILITY :=
+endif
 ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
 bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))
 rs_generated_bc := $(addprefix \