summaryrefslogtreecommitdiffstats
path: root/libnl_2
diff options
context:
space:
mode:
authorEd Heyl <ed@google.com>2012-07-28 11:48:12 -0700
committerEd Heyl <ed@google.com>2012-07-28 11:48:12 -0700
commit3cac204d3537c6a356c922bffb07fcb97f5bb0c7 (patch)
tree710f7bb28670f8df39ab4529c52fce812b471129 /libnl_2
parentce8ffda06397f4a3f8c75f8e2c41f8883625e4f3 (diff)
parentc2dcdc2024ac7487f9773b9b9a4d20bf78e5b7a1 (diff)
downloadsystem_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.tar.gz
system_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.tar.bz2
system_core-3cac204d3537c6a356c922bffb07fcb97f5bb0c7.zip
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Diffstat (limited to 'libnl_2')
-rw-r--r--libnl_2/Android.mk19
1 files changed, 13 insertions, 6 deletions
diff --git a/libnl_2/Android.mk b/libnl_2/Android.mk
index 1745f5a4b..deac9ded3 100644
--- a/libnl_2/Android.mk
+++ b/libnl_2/Android.mk
@@ -1,5 +1,11 @@
+#######################################
+# * Netlink cache not implemented
+# * Library is not thread safe
+#######################################
+
LOCAL_PATH := $(call my-dir)
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -22,9 +28,10 @@ LOCAL_MODULE := libnl_2
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
-#######################################
-# Shared library currently unavailiable
-# * Netlink cache not implemented
-# * Library is not thread safe
-#######################################
-
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES :=
+LOCAL_WHOLE_STATIC_LIBRARIES:= libnl_2
+LOCAL_SHARED_LIBRARIES:= liblog
+LOCAL_MODULE := libnl_2
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)