Switch to librs.FOO.so instead of libFOO.so to prevent collisions.
Change-Id: Ifda68f3d416d87d6f4916e44a350f15b68994536
diff --git a/core/java.mk b/core/java.mk
index e5f5dba..1ade5a7 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -206,7 +206,7 @@
$(renderscript_intermediate)/res/raw/, $(bc_files))
rs_compatibility_jni_libs := $(addprefix \
- $(renderscript_intermediate)/lib, \
+ $(renderscript_intermediate)/librs., \
$(patsubst %.bc,%.so, $(bc_files)))
$(rs_generated_bc) : $(RenderScript_file_stamp)
@@ -231,7 +231,7 @@
$(rs_compatibility_jni_libs): PRIVATE_LIBCLCORE := $(rs_built_clcore)
$(rs_compatibility_jni_libs): PRIVATE_COMPILER_RT := $(rs_compiler_rt)
$(rs_compatibility_jni_libs): PRIVATE_LIBPATH := $(rs_extra_libpath)
-$(rs_compatibility_jni_libs): $(renderscript_intermediate)/lib%.so: \
+$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
$(renderscript_intermediate)/res/raw/%.bc
$(transform-bc-to-so)