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

Commit 4aab5717 authored Nov 29, 2016 by Paul Duffin Committed by android-build-merger Nov 29, 2016

Merge "Use junit-host instead of junit" am: 7dda7e1e am: bbb50128 am: 52277efa

am: 2d4183ff

Change-Id: I1cc3bc8b73d7756c850a1573ca5ff9090e64c184

parents c6b4d6d2 2d4183ff

tools/layoutlib/create/tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := data mock_data
		LOCAL_MODULE := layoutlib-create-tests
		LOCAL_MODULE_TAGS := optional

		LOCAL_JAVA_LIBRARIES := layoutlib_create junit
		LOCAL_JAVA_LIBRARIES := layoutlib_create junit-host
		LOCAL_STATIC_JAVA_LIBRARIES := asm-5.0

		include $(BUILD_HOST_JAVA_LIBRARY)

tools/preload2/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += perflib-prebuilt trove-prebuilt guavalib

		# For JDWP access we use the framework in the JDWP tests from Apache Harmony, for
		# convenience (and to not depend on internal JDK APIs).
		LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit
		LOCAL_STATIC_JAVA_LIBRARIES += apache-harmony-jdwp-tests-host junit-host

		LOCAL_MODULE:= preload2