am b22469a8: am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"

* commit 'b22469a8c50510e141a74932acc3fa17a9dd356c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
This commit is contained in:
Ying Wang
2015-07-21 21:36:46 +00:00
committed by Android Git Automerger
5 changed files with 67 additions and 60 deletions

View File

@@ -253,7 +253,7 @@ endif
$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \
$(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): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX)
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
$(renderscript_intermediate.bc_folder)%.bc
$(transform-bc-to-so)