From f39a25bc28555431c315440d4a14c199178451f6 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 11 Aug 2015 13:48:34 +0100 Subject: [PATCH] Include the okhttp.jar when compiling against internal classes If LOCAL_SDK_VERSION is unset we were compiling against core-libart but not okhttp. okhttp should be an implementation detail but android.net.http.HttpResponseCache implements com.android.okhttp.OkCacheContainer. The OpenJDK 8 version of of javac now requires all interfaces of implemented classes be made available at compile time even with -source 1.7 -target 1.7. This is not an issue when compiling against the android.jar because the implementation of HttpResponseCache in the android.jar does not implement com.android.okhttp.OkCacheContainer. Bug: 23099154 Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849 --- core/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index fec018bb1a..843d7d694e 100644 --- a/core/config.mk +++ b/core/config.mk @@ -595,7 +595,7 @@ endif # allow overriding default Java libraries on a per-target basis ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),) - TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework + TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework okhttp endif # Flags for DEX2OAT