commit df973cb239a40a8bd9378d4cb4660ec5c1b898eb
author Colin Cross <ccross@android.com> Fri Jun 23 21:57:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 21:57:03 2017 +0000
tree 3c7ab5ab4e0c73a0d4ff249fea742722100a7a12
parent 874ee28b681d2270446b6d5003a5512852ef938b
parent 253ffe20e1a1d28d5c9b046807264d7f4fd93a14

Merge "Get java config from soong" am: bf215d166b
am: 253ffe20e1

Change-Id: I4250672ec7cd18a4f82c3e4019a9ec418a17df11

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0bd123c..c22aa1d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -765,11 +765,6 @@
 $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_SYSTEM_INCLUDES := $(TARGET_PROJECT_SYSTEM_INCLUDES)
 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
-endif
-
 # Flags for DEX2OAT
 first_non_empty_of_three = $(if $(1),$(1),$(if $(2),$(2),$(3)))
 DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)