commit 9241386b62c353302c2f9eccda0672685b252b4d
author Ben Cheng <bccheng@google.com> Tue Nov 27 09:45:04 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 27 09:45:04 2012 -0800
tree 70b859a2b108c4ea71859fb0b4fb0e0b61565b69
parent d6f70187df96e4f1968adbe9b52035dc474b7590
parent 39431ecbb18bce56514ef56a487e94633e1fa442

Merge "Add new build rules for target libraries."

Android.mk

diff --git a/Android.mk b/Android.mk
index 2d11071..167882e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,6 @@
 LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
 LOCAL_MODULE := libgccdemangle
 LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -32,7 +31,17 @@
 LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
 LOCAL_MODULE := libgccdemangle
 LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_STATIC_LIBRARY)
+
+##########################
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := cp-demangle.c
+LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
+LOCAL_MODULE := libgccdemangle
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
 
@@ -40,6 +49,17 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := cp-demangle.c
+LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
+LOCAL_MODULE := libgccdemangle
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+##########################
+
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := test.c
 LOCAL_SHARED_LIBRARIES := libgccdemangle
 LOCAL_MODULE := gccdemangle_test