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

Commit a9d9cc64 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:... 

Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b am: cc33b600 am: 78d9b753
am: a43852fc

Change-Id: I3a5adbb7d5c3b8ec552934d898fbb1c2c41f2cfb
parents a9b3b163 a43852fc

core/config.mk

+0 −7
Original line number Diff line number Diff line
@@ -834,13 +834,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
@@ -87,13 +87,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 \

    android.hidl.base-V1.0-java \