Jarjar common dependencies of test apk and app apk to avoid class conflicts.
Also remove android-support-v4 dependency from test apk as there is no
dependency over it in test apk.
Change-Id: I0b459bb831dae6c03adfb4215a8f6a514fc72904
(cherry picked from commit 41f0641ee657215b3efa07c52698c0c4aa2ca1e4)
diff --git a/packages/DocumentsUI/tests/Android.mk b/packages/DocumentsUI/tests/Android.mk
index 6472bf6..febc542 100644
--- a/packages/DocumentsUI/tests/Android.mk
+++ b/packages/DocumentsUI/tests/Android.mk
@@ -7,8 +7,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
LOCAL_PACKAGE_NAME := DocumentsUITests
LOCAL_INSTRUMENTATION_FOR := DocumentsUI
diff --git a/packages/DocumentsUI/tests/jarjar-rules.txt b/packages/DocumentsUI/tests/jarjar-rules.txt
new file mode 100644
index 0000000..360b69b
--- /dev/null
+++ b/packages/DocumentsUI/tests/jarjar-rules.txt
@@ -0,0 +1,2 @@
+rule com.google.common.** docsui.@0
+rule android.support.annotation.** docsui.@0