commit 9407c60800c95902fba0b3c3265520d47c1e7052
author Shih-wei Liao <sliao@google.com> Fri Sep 16 10:36:43 2011 -0700
committer Shih-wei Liao <sliao@google.com> Sun Sep 25 23:34:37 2011 -0700
tree de5f2f0cc2d7840da217ec70c04644f4a6f38b53
parent 4681c809ba35d50fab92c592ce8d2c7f8b2731f7

Stack scanning: Find RegisterMap and unit-test it. Add decoding of the map.

Tests disabled, because there is a bug in System's LoadLibrary.

Change-Id: Ied3f4a31ce454f37c4d0f9caacd4ba03c4adb493

build/Android.libarttest.mk

diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 6e1619d..823f78e 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -24,13 +24,16 @@
   LOCAL_MODULE := libarttest
   LOCAL_MODULE_TAGS := tests
   LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
+  LOCAL_SHARED_LIBRARIES := libartd
   ifeq ($(1),target)
     LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
-    LOCAL_SHARED_LIBRARIES := libdl libstlport
+    LOCAL_SHARED_LIBRARIES += libdl libstlport
+    LOCAL_STATIC_LIBRARIES := libgtest
   else
     LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
-    LOCAL_LDLIBS := -ldl -lrt
+    LOCAL_LDLIBS := -ldl -lrt -lpthread
   endif
+  LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
   ifeq ($(1),target)
     include $(BUILD_SHARED_LIBRARY)
   else