Merge change Ied29246e into eclair
* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
diff --git a/core/definitions.mk b/core/definitions.mk
index 297e6b7..3221525 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1334,11 +1334,9 @@
$(hide) rm -rf $(dir $@)lib
endef
-#TODO: use aapt instead of zip, once it supports junking the path
-# (so adding "xxx/yyy/classes.dex" appears as "classes.dex")
#TODO: update the manifest to point to the dex file
define add-dex-to-package
-$(hide) zip -qj $@ $(PRIVATE_DEX_FILE)
+$(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE)
endef
define add-java-resources-to-package
diff --git a/target/product/generic.mk b/target/product/generic.mk
index 39f4950..e7c1e7b 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -12,6 +12,7 @@
CertInstaller \
DrmProvider \
Email \
+ Gallery \
LatinIME \
Mms \
Music \