summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-05-08 17:24:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-08 17:24:31 +0000
commitdd0d348f3d12094e766b3d8b5619e93da5e0692a (patch)
treee4eb966666f478118ff295c1159389a0959f0340
parent664d5f921d63a2b82873202e74668d1c82f2603b (diff)
parent4f2a23cf29ddf0bbc81021053215fec5ed42f9b7 (diff)
downloadsdk-dd0d348f3d12094e766b3d8b5619e93da5e0692a.tar.gz
am 4f2a23cf: Merge "Add libcompiler_rt.so to Linux prebuilts."
* commit '4f2a23cf29ddf0bbc81021053215fec5ed42f9b7': Add libcompiler_rt.so to Linux prebuilts.
-rw-r--r--tools/Android.mk13
-rwxr-xr-xtools/linux/libcompiler_rt.sobin0 -> 30604 bytes
2 files changed, 13 insertions, 0 deletions
diff --git a/tools/Android.mk b/tools/Android.mk
index 9e8a1b667..434f1427a 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -203,6 +203,19 @@ LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
LOCAL_IS_HOST_MODULE := true
include $(BUILD_PREBUILT)
+
+##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libcompiler_rt
+LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE)$(HOST_SHLIB_SUFFIX)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
+LOCAL_IS_HOST_MODULE := true
+
+include $(BUILD_PREBUILT)
+
##################################
endif # TARGET_BUILD_APPS only
diff --git a/tools/linux/libcompiler_rt.so b/tools/linux/libcompiler_rt.so
new file mode 100755
index 000000000..433b33586
--- /dev/null
+++ b/tools/linux/libcompiler_rt.so
Binary files differ