Merge "Get java config from soong"
This commit is contained in:
commit
bf215d166b
1 changed files with 0 additions and 5 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue