Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 000cf159 authored Jun 10, 2016 by TreeHugger Robot Committed by Android (Google) Code Review Jun 10, 2016

Merge "Jarjar common dependencies of test apk and app apk to avoid class conflicts."

parents 9d081a5c 43b9a39c

packages/DocumentsUI/tests/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,8 +7,9 @@ LOCAL_MODULE_TAGS := tests

		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

packages/DocumentsUI/tests/jarjar-rules.txt

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		rule com.google.common.** docsui.@0
		rule android.support.annotation.** docsui.@0