commit bf215d166b213873aef097e4e2a92f4ebbb541d0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 23 21:40:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 23 21:40:16 2017 +0000
tree 5b27ce8bfafbbbba84ce94bebb9456f230361a79
parent 47b734db5783d4c6d7fa308b02ecff9f65afe53e
parent b12d4b7ac25c7775023bbf34b26f7695e0efd11a

Merge "Get java config from soong"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 5895128..66511c1 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -762,11 +762,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)