diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt.mk | 4 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 16 | ||||
| -rw-r--r-- | core/product_config.mk | 2 |
3 files changed, 10 insertions, 12 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/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 70b83a4..e0932a9 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -8,15 +8,13 @@ ifneq (true,$(WITH_DEXPREOPT)) LOCAL_DEX_PREOPT := else # WITH_DEXPREOPT=true ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty - ifneq (,$(LOCAL_SRC_FILES)) # LOCAL_SRC_FILES not empty - ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined - ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty - LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) - else # LOCAL_APK_LIBRARIES not empty - LOCAL_DEX_PREOPT := nostripping - endif # LOCAL_APK_LIBRARIES not empty - endif # LOCAL_DEX_PREOPT undefined - endif # LOCAL_SRC_FILES not empty + ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined + ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty + LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) + else # LOCAL_APK_LIBRARIES not empty + LOCAL_DEX_PREOPT := nostripping + endif # LOCAL_APK_LIBRARIES not empty + endif # LOCAL_DEX_PREOPT undefined endif # TARGET_BUILD_APPS empty endif # WITH_DEXPREOPT=true ifeq (false,$(LOCAL_DEX_PREOPT)) diff --git a/core/product_config.mk b/core/product_config.mk index a2be30b..0574c66 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) |