Merge "Add filterfw.jar to standard list of java libraries to include."

This commit is contained in:
Eino-Ville Talvala
2011-08-29 15:12:04 -07:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -4,7 +4,7 @@
#################################### ####################################
# TODO: replace it with device's BOOTCLASSPATH # TODO: replace it with device's BOOTCLASSPATH
DEXPREOPT_BOOT_JARS := core:apache-xml:bouncycastle:ext:framework:android.policy:services:core-junit DEXPREOPT_BOOT_JARS := core:apache-xml:bouncycastle:ext:framework:android.policy:services:core-junit:filterfw
DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
DEXPREOPT_BUILD_DIR := $(OUT_DIR) DEXPREOPT_BUILD_DIR := $(OUT_DIR)

View File

@@ -29,7 +29,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif endif
else else
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES := core core-junit ext framework filterfw $(LOCAL_JAVA_LIBRARIES)
endif endif
endif endif