commit 4639045dd894b017e1fb767990b02b1bf0c53143
author Brian Attwell <brianattwell@google.com> Wed Apr 01 16:42:33 2015 -0700
committer Brian Attwell <brianattwell@google.com> Wed Apr 01 16:42:33 2015 -0700
tree 4cbfef03385e49772b5db1703ccff67d77ea0c29
parent 81c3829f8a9377cb2e93c1fa6d223d223b78f371

Stop using static common test lib. Fix Jack build

This is an exact copy of ag/655143.

Bug: 19667686
Change-Id: I36d5e3e91b0e58e0fc4ecb4a3068c994f9b90111

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