am 65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."

* commit '65ca752aa18d6cd24196b5ba0fd6f53af49f8c56':
  Add FORCE_BUILD_RS_COMPAT option.
This commit is contained in:
Stephen Hines 2013-11-27 15:26:48 -08:00 committed by Android Git Automerger
commit 8d28269837

View file

@ -195,7 +195,7 @@ renderscript_intermediate := $(intermediates)/renderscript
# We don't need the .so files in bundled branches
# Prevent these from showing up on the device
ifneq (,$(TARGET_BUILD_APPS))
ifneq (,$(TARGET_BUILD_APPS)$(FORCE_BUILD_RS_COMPAT))
rs_compatibility_jni_libs := $(addprefix \
$(renderscript_intermediate)/librs., \