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

Commit 692309c9 authored by Igor Murashkin's avatar Igor Murashkin Committed by android-build-merger
Browse files

Merge "core: Move core.oat bootjar definitions into envsetup.mk" 

am: 6cb7688e

Change-Id: I1a5ce06a6c6fed382b970ed13c495232b30b22a5
parents eec57479 6cb7688e

core/envsetup.mk

+7 −0
Original line number Diff line number Diff line
@@ -190,6 +190,13 @@ _vendor_path_placeholder := ||VENDOR-PATH-PH|| 
TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)

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



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

# 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))

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



# Read the product specs so we can get TARGET_DEVICE and other

# variables that we need in order to locate the output files.

include $(BUILD_SYSTEM)/product_config.mk

target/product/core_minimal.mk

+5 −6
Original line number Diff line number Diff line
@@ -88,20 +88,19 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml



ifeq ($(TARGET_CORE_JARS),)

$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)

endif



# The order of PRODUCT_BOOT_JARS matters.

PRODUCT_BOOT_JARS := \

    core-oj \

    core-libart \

    conscrypt \

    okhttp \

    $(TARGET_CORE_JARS) \

    legacy-test \

    bouncycastle \

    ext \

    framework \

    telephony-common \

    voip-common \

    ims-common \

    apache-xml \

    org.apache.http.legacy.boot



# The order of PRODUCT_SYSTEM_SERVER_JARS matters.

target/product/core_tiny.mk

+5 −6
Original line number Diff line number Diff line
@@ -83,20 +83,19 @@ PRODUCT_PACKAGES += \ 
    logd \

    wifi-service



ifeq ($(TARGET_CORE_JARS),)

$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)

endif



# The order matters

PRODUCT_BOOT_JARS := \

    core-oj \

    core-libart \

    conscrypt \

    okhttp \

    $(TARGET_CORE_JARS) \

    legacy-test \

    bouncycastle \

    ext \

    framework \

    telephony-common \

    voip-common \

    ims-common \

    apache-xml \

    nullwebview \

    org.apache.http.legacy.boot

target/product/runtime_libart.mk

+5 −6
Original line number Diff line number Diff line
@@ -16,15 +16,14 @@ 


# Provides a functioning ART environment without Android frameworks



ifeq ($(TARGET_CORE_JARS),)

$(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable)

endif



# Minimal boot classpath. This should be a subset of PRODUCT_BOOT_JARS, and equivalent to

# TARGET_CORE_JARS.

PRODUCT_PACKAGES += \

    apache-xml \

    bouncycastle \

    core-oj \

    core-libart \

    conscrypt \

    okhttp \

    $(TARGET_CORE_JARS)



# Additional mixins to the boot classpath.

PRODUCT_PACKAGES += \