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

Commit bf215d16 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Get java config from soong"

parents 47b734db b12d4b7a

core/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -762,11 +762,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES := $(TARGET_PROJECT_INCLUDE 
$(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)