aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-03-22 10:18:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-22 10:18:56 -0700
commit4b91e3328c79383bcebed982ce536046ea316456 (patch)
treef0ec121bb5e47e712d2859975415748818cdddee
parent3ebb3dad6e8da55b2057d064c2c0275f478b4f61 (diff)
parentef3eb5f74022050666168922d96c79531401a16d (diff)
downloadsystem_core-4b91e3328c79383bcebed982ce536046ea316456.tar.gz
system_core-4b91e3328c79383bcebed982ce536046ea316456.tar.bz2
system_core-4b91e3328c79383bcebed982ce536046ea316456.zip
am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
* commit 'ef3eb5f74022050666168922d96c79531401a16d': Added rules to build 64-bit libraries: lib64cutils.a and lib64log.a
-rw-r--r--libcutils/Android.mk11
-rw-r--r--liblog/Android.mk12
2 files changed, 23 insertions, 0 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index effaae08..b83ce68b 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -94,6 +94,17 @@ LOCAL_CFLAGS += $(hostSmpFlag)
include $(BUILD_HOST_STATIC_LIBRARY)
+# Static library for host, 64-bit
+# ========================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := lib64cutils
+LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
+LOCAL_LDLIBS := -lpthread
+LOCAL_STATIC_LIBRARIES := lib64log
+LOCAL_CFLAGS += $(hostSmpFlag) -m64
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+
# Shared and static library for target
# ========================================================
include $(CLEAR_VARS)
diff --git a/liblog/Android.mk b/liblog/Android.mk
index bd4fed4a..bd2590e7 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -40,6 +40,7 @@ endif
liblog_host_sources := $(liblog_sources) fake_log_device.c
+
# Static library for host
# ========================================================
LOCAL_MODULE := liblog
@@ -48,6 +49,17 @@ LOCAL_LDLIBS := -lpthread
LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
include $(BUILD_HOST_STATIC_LIBRARY)
+
+# Static library for host, 64-bit
+# ========================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := lib64log
+LOCAL_SRC_FILES := $(liblog_host_sources)
+LOCAL_LDLIBS := -lpthread
+LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+
# Shared and static library for target
# ========================================================
include $(CLEAR_VARS)