Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
diff --git a/core/definitions.mk b/core/definitions.mk
index 2cf5283..7bee582 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -833,7 +833,7 @@
$(RS_PREBUILT_COMPILER_RT) \
-o $@ -L prebuilts/gcc/ \
-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(RS_PREBUILT_LIBPATH) \
- -lRSSupport -lm
+ -lRSSupport -lm -lc
endef
###########################################################
diff --git a/core/java.mk b/core/java.mk
index da670f9..7c8c894f 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -214,7 +214,7 @@
$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \
$(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)
-$(rs_compatibility_jni_libs): | $(BCC_COMPAT)
+$(rs_compatibility_jni_libs): $(BCC_COMPAT)
$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX)
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
$(renderscript_intermediate.COMMON)/res/raw/%.bc