Merge "Remove unused zipalign macros" am: 56183c2ee2 am: e4a0dd15cc

am: d20c5e2a81

Change-Id: Id3a7d0f64d581376dcb38bc324f252ed99332a1a
This commit is contained in:
Dan Willemsen 2017-02-18 06:23:05 +00:00 committed by android-build-merger
commit 0c89af6a6a

View file

@ -2808,13 +2808,6 @@ $(hide) rm -f $@
$(hide) cp -p $< $@ $(hide) cp -p $< $@
endef endef
# The same as copy-file-to-target, but use the zipalign tool to do so.
define copy-file-to-target-with-zipalign
@mkdir -p $(dir $@)
$(hide) rm -f $@
$(hide) $(ZIPALIGN) -f 4 $< $@
endef
# The same as copy-file-to-target, but strip out "# comment"-style # The same as copy-file-to-target, but strip out "# comment"-style
# comments (for config files and such). # comments (for config files and such).
define copy-file-to-target-strip-comments define copy-file-to-target-strip-comments
@ -2845,12 +2838,6 @@ define transform-prebuilt-to-target
$(copy-file-to-target) $(copy-file-to-target)
endef endef
# Copy a prebuilt file to a target location, using zipalign on it.
define transform-prebuilt-to-target-with-zipalign
@echo "$($(PRIVATE_PREFIX)DISPLAY) Prebuilt APK: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-with-zipalign)
endef
# Copy a prebuilt file to a target location, stripping "# comment" comments. # Copy a prebuilt file to a target location, stripping "# comment" comments.
define transform-prebuilt-to-target-strip-comments define transform-prebuilt-to-target-strip-comments
@echo "$($(PRIVATE_PREFIX)DISPLAY) Prebuilt: $(PRIVATE_MODULE) ($@)" @echo "$($(PRIVATE_PREFIX)DISPLAY) Prebuilt: $(PRIVATE_MODULE) ($@)"