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

Commit 995783d4 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart" 

* commit '57befc90':
  Switch another reference from core to core-libart
parents dde1a37e 57befc90

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources) 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class,$(LOCAL_SRC_FILES))

ifeq ($(my_prefix),TARGET_)

ifeq ($(LOCAL_SDK_VERSION),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-libart)

else

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.