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

Commit cc33b600 authored by Mariano Giardina's avatar Mariano Giardina Committed by android-build-merger
Browse files

Merge "Revert "core: Move core.oat bootjar definitions into core/config"" 

am: 1e14bc3b

Change-Id: I6d366d325fd951302c492e32248d0f6469999225
parents 5022a346 1e14bc3b

core/config.mk

+0 −7
Original line number Diff line number Diff line
@@ -800,13 +800,6 @@ else 
SUPPORT_LIBRARY_ROOT := frameworks/support

endif



#################################################################

# Set up minimal BOOTCLASSPATH list of jars to build/execute

# java code with dalvikvm/art.

#################################################################

TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml

HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))



# Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.

# The 'current' version is whatever this source tree is.

#

target/product/core_tiny.mk

+6 −1
Original line number Diff line number Diff line
@@ -85,13 +85,18 @@ PRODUCT_PACKAGES += \ 


# The order matters

PRODUCT_BOOT_JARS := \

    $(TARGET_CORE_JARS) \

    core-oj \

    core-libart \

    conscrypt \

    okhttp \

    legacy-test \

    bouncycastle \

    ext \

    framework \

    telephony-common \

    voip-common \

    ims-common \

    apache-xml \

    nullwebview \

    org.apache.http.legacy.boot