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

Commit 56b6d24b authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Get java config from soong" am: bf215d16 am: 253ffe20 am: df973cb2 

am: 7a1615fb

Change-Id: I9c6b8d2998513086734ee730931e6b955f37e35d
parents 67638002 7a1615fb

core/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -796,11 +796,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)