Stop using static common test lib. Fix Jack build
In order to depend on TestCommon inside this test, we can
do either of the following
1) Use a static library
2) Directly use TestCommon code
Option 1 requires us to manually recompile the static library
(or use mma) every time we want to change the static library.
Even worse, because of changes to Jack we aren't guaranteed
that the static library will be built the first time for us.
If we wanted to, we could fix this by directly executing
TestCommon's makefile inside this makefile.
Option 2, essentially makes TestCommon code a part of
this project. It gets recompiled every time you run mm.
Bug: 19667686
Change-Id: Ib31c5cfda8a7d7e55e63b2d308307574ea1e2612
diff --git a/tests/Android.mk b/tests/Android.mk
index 241ff5e..880f62f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,10 +6,12 @@
LOCAL_CERTIFICATE := shared
LOCAL_JAVA_LIBRARIES := android.test.runner
-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)
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_PACKAGE_NAME := ContactsTests