From 4052fe181a499f52729b7178f11ae91212823682 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Mon, 15 Jul 2013 12:50:30 -0700
Subject: [PATCH] Add a static version of the test.

Change-Id: I222d441fb1f6946b5f2cad3c75354a8632603fb9
---
 libc_test/Android.mk | 24 +++++++++++++++++++++---
 1 file 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)
-- 
2.11.0