Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
bug 12924018
Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
diff --git a/core/config.mk b/core/config.mk
index 33ce619..14f4b1b 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -598,5 +598,6 @@
# API Level lists for Renderscript Compat lib.
RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20
+RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
include $(BUILD_SYSTEM)/dumpvar.mk
diff --git a/core/java.mk b/core/java.mk
index 13cf39d..dd628b2 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -233,10 +233,16 @@
rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so
LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni
+rs_support_io_lib :=
+# check if the target api level support USAGE_IO
+ifeq ($(filter $(RSCOMPAT_NO_USAGEIO_API_LEVELS),$(renderscript_target_api)),)
+rs_support_io_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupportIO.so
+LOCAL_JNI_SHARED_LIBRARIES += libRSSupportIO
+endif
$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \
- $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)
+ $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt)
$(rs_compatibility_jni_libs): $(BCC_COMPAT)
$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX)
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
