diff options
| author | Ying Wang <wangying@android.com> | 2015-01-29 18:38:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:38:00 +0000 |
| commit | 723db51fdb10f3c691a77148cab49f368ff82310 (patch) | |
| tree | 88a4d9e8d73ef91cdfb561c9b4b9eb4e3d1e122e /core/definitions.mk | |
| parent | 954baa1fff6d8b3a4b4e7292c2faaf440a496671 (diff) | |
| parent | 7c05897b69801e1945889a9b1a89b86bbbbbdd3a (diff) | |
| download | build-723db51fdb10f3c691a77148cab49f368ff82310.zip build-723db51fdb10f3c691a77148cab49f368ff82310.tar.gz build-723db51fdb10f3c691a77148cab49f368ff82310.tar.bz2 | |
am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
* commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index a44ffdb..56051bc 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1968,7 +1968,9 @@ endef define initialize-package-file @mkdir -p $(dir $(2)) $(hide) cp -f $(1) $(2) -$(hide) zip -qd $(2) "*.class" "*/" || true # Ignore the error when nothing to delete. +$(hide) zip -qd $(2) "*.class" \ + $(if $(strip $(PRIVATE_DONT_DELETE_JAR_DIRS)),,"*/") \ + || true # Ignore the error when nothing to delete. endef #TODO: we kinda want to build different asset packages for |