am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit 'fce6b45f629e59b79beed1c18486530c00769bbf' into eclair
* commit 'fce6b45f629e59b79beed1c18486530c00769bbf':
doc change: template/asset changes for sdk package.
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/core/prebuilt.mk b/core/prebuilt.mk
index 4cbbb99..b2bb07c 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -26,6 +26,8 @@
prebuilt_module_is_a_library :=
endif
+PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
+
# Ensure that prebuilt .apks have been aligned.
ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN)
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 \