commit ea5f3080cba0cae280345f4ca4f23d3284f8047b
author Brian Attwell <brianattwell@google.com> Fri Apr 03 00:30:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 03 00:30:04 2015 +0000
tree 140067cd19440ff4c51069d93f19025c5df5c6fc
parent 0d27e1d231226e6ca5e7ed51225f7886598b05b0
parent 4639045dd894b017e1fb767990b02b1bf0c53143

Merge "Stop using static common test lib. Fix Jack build"

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index d440f6a..30c6286 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,7 +10,11 @@
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.contacts.common.test
+src_dirs := src \
+    ../../ContactsCommon/TestCommon/src
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 
 LOCAL_PACKAGE_NAME := DialerTests