diff options
| -rw-r--r-- | core/dex_preopt.mk | 4 | ||||
| -rw-r--r-- | core/product_config.mk | 2 | ||||
| -rw-r--r-- | target/product/core_base.mk | 19 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 15 |
4 files changed, 34 insertions, 6 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index c9530c2..160f128 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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) diff --git a/core/product_config.mk b/core/product_config.mk index b3e4c0a..b438830 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index cde2b85..658e502 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -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 diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 159e7b2..21a6e8b 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -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 |