Commit a01bf0ad authored Feb 06, 2017 by Paul Duffin Committed by android-build-merger Feb 06, 2017

Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am:...

Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26 am: 8ac87364
am: 5c2f9714

Change-Id: I86869e79276554fa7bef0b2d7555108126118c34

parents 21ae00e4 5c2f9714

core/config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -701,7 +701,7 @@ endif

		# allow overriding default Java libraries on a per-target basis
		ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
		TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart ext framework okhttp
		TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart legacy-test ext framework okhttp
		endif

		# Flags for DEX2OAT