commit d0202e53900db6a07ff154c7b1e31b20c3942ad3
author David 'Digit' Turner <digit@google.com> Sun Jan 16 23:04:13 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 16 23:04:13 2011 -0800
tree 8de29fa1c1361a2d967e676f1b9035b0d7f7e896
parent 67929098bf638fca5c5940b9cb48a7a2ad6c4104
parent 665aefdd2a47abe7abff61a83e78a2e4470ca004

am 665aefdd: am 1fa29fc9: Merge "Add librs_jni to the generic product packages." into honeycomb

* commit '665aefdd2a47abe7abff61a83e78a2e4470ca004':
  Add librs_jni to the generic product packages.

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 6e0b093..87bf2d3 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:bouncycastle:ext:framework:android.policy:services:core-junit
+DEXPREOPT_BOOT_JARS := core:apache-xml:bouncycastle:ext:framework:android.policy:services:core-junit
 DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
 
 DEXPREOPT_BUILD_DIR := $(OUT_DIR)

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index 06b7003..7957a07 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -23,6 +23,7 @@
     ro.config.alarm_alert=Alarm_Classic.ogg
 
 PRODUCT_PACKAGES := \
+    apache-xml \
     bouncycastle \
     com.android.location.provider \
     com.android.location.provider.xml \