lib/runtime

Change-Id: I676353142b5e65e3ee5402fd47b342838eed6246
diff --git a/Android.mk b/Android.mk
index 0a52a55..3a66833 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,13 +54,13 @@
 endif
 
 #
-# rslib.bc
+# libruntime.bc
 # ========================================================
 include $(CLEAR_VARS)
-LOCAL_MODULE := rslib.bc
+LOCAL_MODULE := libruntime.bc
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := lib/bcc/$(LOCAL_MODULE)
+LOCAL_SRC_FILES := lib/runtime/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 #
@@ -145,8 +145,8 @@
   $(LOCAL_STATIC_LIBRARIES)
 endif
 
-# This makes rslib.bc get installed if and only if the target libbcc.so is installed.
-LOCAL_REQUIRED_MODULES := rslib.bc
+# This makes libruntime.bc get installed if and only if the target libbcc.so is installed.
+LOCAL_REQUIRED_MODULES := libruntime.bc
 
 # -Wl,--exclude-libs=ALL would hide most of the symbols in the shared library
 # and reduces the size of libbcc.so by about 800k.
diff --git a/lib/bcc/Compiler.cpp b/lib/bcc/Compiler.cpp
index 49fcbf3..4e18099 100644
--- a/lib/bcc/Compiler.cpp
+++ b/lib/bcc/Compiler.cpp
@@ -280,7 +280,7 @@
   }
 
 #if 1
-  MEM.reset(llvm::MemoryBuffer::getFile("/system/lib/rslib.bc"));
+  MEM.reset(llvm::MemoryBuffer::getFile("/system/lib/libruntime.bc"));
 
 #else
   MEM.reset(llvm::MemoryBuffer::getMemBuffer(
diff --git a/lib/bcc/rslib.bc b/lib/runtime/libruntime.bc
similarity index 100%
rename from lib/bcc/rslib.bc
rename to lib/runtime/libruntime.bc
Binary files differ
diff --git a/lib/bcc/rslib.ll b/lib/runtime/libruntime.ll
similarity index 100%
rename from lib/bcc/rslib.ll
rename to lib/runtime/libruntime.ll