Commits

Christopher Ferris  committed dd9c23b Merge

am 23062f99: Merge "Add a static version of the test."

* commit '23062f994c2181d5de4f6f5b764c83d613465bba':
Add a static version of the test.

  • Participants
  • Parent commits 1f5c5c7, 23062f9

Comments (0)

Files changed (1)

File libc_test/Android.mk

 # 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
 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)