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

Commit 83709a21 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 

* commit '95fc1a50':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
parents a2466857 95fc1a50

core/dex_preopt.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ $(error No value for DALVIK_VM_LIB) 
endif



# list of boot classpath jars for dexpreopt

DEXPREOPT_BOOT_JARS := $(PRODUCT_BOOT_JARS)

DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))

DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))

DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar))



DEXPREOPT_BUILD_DIR := $(OUT_DIR)

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ endif 
#############################################################################



# A list of module names of BOOTCLASSPATH (jar files)

PRODUCT_BOOT_JARS := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS)

PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS))



# Find the device that this product maps to.

TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)

target/product/core_base.mk

+17 −2
Original line number Diff line number Diff line
@@ -67,5 +67,20 @@ PRODUCT_PACKAGES += \ 
    voip-common



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)

# Override the PRODUCT_BOOT_JARS set in core_minimal.mk

PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium
 
# Override the PRODUCT_BOOT_JARS set in core_minimal.mk. The order matters.

PRODUCT_BOOT_JARS := \

    core \

    conscrypt \

    okhttp \

    core-junit \

    bouncycastle \

    ext \

    framework \

    framework2 \

    telephony-common \

    voip-common \

    mms-common \

    android.policy \

    services \

    apache-xml \

    webviewchromium

target/product/core_minimal.mk

+14 −1
Original line number Diff line number Diff line
@@ -57,7 +57,20 @@ PRODUCT_PACKAGES += \ 
    sensorservice \

    uiautomator



PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:android.policy:services:apache-xml:webviewchromium

# The order of PRODUCT_BOOT_JARS matters.

PRODUCT_BOOT_JARS := \

    core \

    conscrypt \

    okhttp \

    core-junit \

    bouncycastle \

    ext \

    framework \

    framework2 \

    android.policy \

    services \

    apache-xml \

    webviewchromium



PRODUCT_RUNTIMES := runtime_libdvm_default

PRODUCT_RUNTIMES += runtime_libart