openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
This commit is contained in:
Ying Wang 2014-01-07 16:50:49 -08:00 committed by Android Git Automerger
parent f05eecc368 f12d48104b
commit 95fc1a5075
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/dex_preopt.mk
View File

@ -8,8 +8,8 @@ $(error No value for DALVIK_VM_LIB)
endif endif
# list of boot classpath jars for dexpreopt # list of boot classpath jars for dexpreopt
DEXPREOPT_BOOT_JARS := $(PRODUCT_BOOT_JARS) DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))
DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)
PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar)) PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar))
DEXPREOPT_BUILD_DIR := $(OUT_DIR) DEXPREOPT_BUILD_DIR := $(OUT_DIR)

2
core/product_config.mk
View File

@ -280,7 +280,7 @@ endif
############################################################################# #############################################################################
# A list of module names of BOOTCLASSPATH (jar files) # 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. # Find the device that this product maps to.
TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE) TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)

19
target/product/core_base.mk
View File

@ -67,5 +67,20 @@ PRODUCT_PACKAGES += \
voip-common voip-common
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
# Override the PRODUCT_BOOT_JARS set in core_minimal.mk # 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 PRODUCT_BOOT_JARS := \
core \
conscrypt \
okhttp \
core-junit \
bouncycastle \
ext \
framework \
framework2 \
telephony-common \
voip-common \
mms-common \
android.policy \
services \
apache-xml \
webviewchromium

15
target/product/core_minimal.mk
View File

@ -57,7 +57,20 @@ PRODUCT_PACKAGES += \
sensorservice \ sensorservice \
uiautomator 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_libdvm_default
PRODUCT_RUNTIMES += runtime_libart PRODUCT_RUNTIMES += runtime_libart