diff options
| author | Ying Wang <wangying@google.com> | 2014-01-08 01:01:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-08 01:01:21 +0000 |
| commit | a21b8ea724ca043cb4e95d0e9a8eef223ff8561e (patch) | |
| tree | 65fbd7d7717464b57cc1a5ba378a638bb019dfc8 /core | |
| parent | 47182de7603493a083cb39232b4d6c545c06cd6f (diff) | |
| parent | a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2 (diff) | |
| download | replicant_build-a21b8ea724ca043cb4e95d0e9a8eef223ff8561e.zip replicant_build-a21b8ea724ca043cb4e95d0e9a8eef223ff8561e.tar.gz replicant_build-a21b8ea724ca043cb4e95d0e9a8eef223ff8561e.tar.bz2 | |
am a292b7b0: am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2':
PRODUCT_BOOT_JARS as a list of jar names separated by space
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt.mk | 4 | ||||
| -rw-r--r-- | core/product_config.mk | 2 |
2 files changed, 3 insertions, 3 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) |