Tracking rename of libcompiler-rt.a to libcompiler_rt.a
Change-Id: I3f9396dbef38d38245a181023f2ad0f74866458c
diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index ac4bf42..9866343 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -196,14 +196,14 @@
$(eval $(call build-libart-compiler,host,debug))
endif
-# Rule to build /system/lib/libcompiler-rt.a
+# Rule to build /system/lib/libcompiler_rt.a
# Usually static libraries are not installed on the device.
ifeq ($(ART_USE_PORTABLE_COMPILER),true)
ifeq ($(ART_BUILD_TARGET),true)
-# TODO: Move to external/compiler-rt
-$(eval $(call copy-one-file, $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler-rt,,)/libcompiler-rt.a, $(TARGET_OUT_SHARED_LIBRARIES)/libcompiler-rt.a))
+# TODO: Move to external/compiler_rt
+$(eval $(call copy-one-file, $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler_rt,,)/libcompiler_rt.a, $(TARGET_OUT_SHARED_LIBRARIES)/libcompiler_rt.a))
-$(DEX2OAT): $(TARGET_OUT_SHARED_LIBRARIES)/libcompiler-rt.a
+$(DEX2OAT): $(TARGET_OUT_SHARED_LIBRARIES)/libcompiler_rt.a
endif
endif
diff --git a/src/elf_writer.cc b/src/elf_writer.cc
index 3cc0fd1..b368117 100644
--- a/src/elf_writer.cc
+++ b/src/elf_writer.cc
@@ -294,7 +294,7 @@
compiler_runtime_lib += "/lib/gcc/i686-linux/4.6.x-google/libgcc.a";
} else {
compiler_runtime_lib += android_root;
- compiler_runtime_lib += "/lib/libcompiler-rt.a";
+ compiler_runtime_lib += "/lib/libcompiler_rt.a";
}
// TODO: ownership of compiler_runtime_lib_input?
mcld::Input* compiler_runtime_lib_input = ir_builder_->ReadInput(compiler_runtime_lib,