Merge "Remove dependency on libcompiler_rt.so for RS compatibility."
diff --git a/core/java.mk b/core/java.mk
index a0c2f02..e5f5dba 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -222,7 +222,7 @@
 endif # TARGET_BUILD_APPS
 rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so
 rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so
-LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni libcompiler_rt
+LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni
 
 $(rs_compatibility_jni_libs): $(RenderScript_file_stamp)
 $(rs_compatibility_jni_libs): $(BCC_COMPAT) $(rs_built_clcore)