commit 5d8a5ceecb291b6ab6ba64f9e604db419fb81c8c
author Eino-Ville Talvala <etalvala@google.com> Mon Aug 29 15:12:04 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 29 15:12:04 2011 -0700
tree b38a9e86db9b6f3e91bf33135ca6140ade9eef76
parent 45bee774eb8c34df3b0e48557d17e28d78aada2a
parent 76a7d82fac1e94617a97393a60f1a2877d841105

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

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 9f44c32..67709f4 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -4,7 +4,7 @@
 ####################################
 
 # 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_BUILD_DIR := $(OUT_DIR)

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index c92e439..16cbb9c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -29,7 +29,7 @@
   endif
 else
   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