Merge "Revert "Build rules for running bcc_strip_attr."" into jb-mr2-dev
diff --git a/lib/Renderscript/runtime/build_bc_lib.mk b/lib/Renderscript/runtime/build_bc_lib.mk
index 211ad68..d003f5b 100644
--- a/lib/Renderscript/runtime/build_bc_lib.mk
+++ b/lib/Renderscript/runtime/build_bc_lib.mk
@@ -16,8 +16,6 @@
include $(BUILD_SYSTEM)/base_rules.mk
-BCC_STRIP_ATTR := $(HOST_OUT_EXECUTABLES)/bcc_strip_attr$(HOST_EXECUTABLE_SUFFIX)
-
# We need to pass the +long64 flag to the underlying version of Clang, since
# we are generating a library for use with Renderscript (64-bit long type,
# not 32-bit).
@@ -59,15 +57,9 @@
-include $(c_bc_files:%.bc=%.d)
-include $(ll_bc_files:%.bc=%.d)
-unstripped := $(dir $(LOCAL_BUILT_MODULE))unstripped.bc
-
-$(unstripped): PRIVATE_BC_FILES := $(c_bc_files) $(ll_bc_files)
-$(unstripped): $(c_bc_files) $(ll_bc_files)
-$(unstripped): $(LLVM_LINK) $(clcore_LLVM_LD)
-$(unstripped): $(LLVM_AS)
+$(LOCAL_BUILT_MODULE): PRIVATE_BC_FILES := $(c_bc_files) $(ll_bc_files)
+$(LOCAL_BUILT_MODULE): $(c_bc_files) $(ll_bc_files)
+$(LOCAL_BUILT_MODULE): $(LLVM_LINK) $(clcore_LLVM_LD)
+$(LOCAL_BUILT_MODULE): $(LLVM_AS)
@mkdir -p $(dir $@)
$(hide) $(LLVM_LINK) $(PRIVATE_BC_FILES) -o $@
-
-
-$(LOCAL_BUILT_MODULE): $(unstripped) $(BCC_STRIP_ATTR)
- $(hide) $(BCC_STRIP_ATTR) -o $@ $(unstripped)
