Merge change I04432db5 into eclair-mr2
* changes: use aapt to build jar files instead of the system zip
This commit is contained in:
@@ -1334,11 +1334,9 @@ $(hide) (cd $(dir $@) && zip -r $(notdir $@) lib)
|
|||||||
$(hide) rm -rf $(dir $@)lib
|
$(hide) rm -rf $(dir $@)lib
|
||||||
endef
|
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
|
#TODO: update the manifest to point to the dex file
|
||||||
define add-dex-to-package
|
define add-dex-to-package
|
||||||
$(hide) zip -qj $@ $(PRIVATE_DEX_FILE)
|
$(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define add-java-resources-to-package
|
define add-java-resources-to-package
|
||||||
|
Reference in New Issue
Block a user