summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2013-07-16 16:31:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-16 16:31:51 -0700
commitdd9c23b6589351ed981e19c636761dc92ad2769c (patch)
treedd93da1a9d595a7eef2987cc7a0c9a9f4ab730b2
parent1f5c5c76aff9d7bb1723f1582b975b190dccc2f6 (diff)
parent23062f994c2181d5de4f6f5b764c83d613465bba (diff)
downloadextras-dd9c23b6589351ed981e19c636761dc92ad2769c.tar.gz
am 23062f99: Merge "Add a static version of the test."
* commit '23062f994c2181d5de4f6f5b764c83d613465bba': Add a static version of the test.
-rw-r--r--libc_test/Android.mk24
1 files changed, 21 insertions, 3 deletions
diff --git a/libc_test/Android.mk b/libc_test/Android.mk
index 78ebfb3c..296b087d 100644
--- a/libc_test/Android.mk
+++ b/libc_test/Android.mk
@@ -1,11 +1,13 @@
# Copyright 2013 The Android Open Source Project
LOCAL_PATH:= $(call my-dir)
+
+src_files = \
+ main.cpp \
+
include $(CLEAR_VARS)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-# Add any strcmp or memcpy implementation files below.
-LOCAL_SRC_FILES:= \
- main.cpp \
+LOCAL_SRC_FILES:= $(src_files)
LOCAL_MODULE := libc_test
LOCAL_MODULE_TAGS := debug
@@ -15,3 +17,19 @@ LOCAL_ASFLAGS := -mthumb
endif # arm
include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(src_files)
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE := libc_test_static
+LOCAL_STATIC_LIBRARIES := libc libm
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_ASFLAGS := -mthumb
+endif # arm
+
+include $(BUILD_EXECUTABLE)