commit 76a7d82fac1e94617a97393a60f1a2877d841105
author Eino-Ville Talvala <etalvala@google.com> Mon Aug 22 10:42:44 2011 -0700
committer Eino-Ville Talvala <etalvala@google.com> Fri Aug 26 14:22:57 2011 -0700
tree bc2147fba4f0669ec0fa95a6b4a5b3c4ecddb456
parent d7d096df71c65cbcd35def83bdb4f7cc86c3f290

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

Since classes from this jar are part of the public API, it should be
included by default.

Also add the jar into the dex_preopt list.

Bug: 5098987
Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd

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