Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6cbbe6 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev

parents b5b4829c 6a4bd696

core/Makefile

+6 −8
Original line number Diff line number Diff line
@@ -419,8 +419,10 @@ package-stats: $(PACKAGE_STATS_FILE) 
# -----------------------------------------------------------------

# Cert-to-package mapping.  Used by the post-build signing tools.

# Use a macro to add newline to each echo command

define _apkcerts_echo_with_newline

$(hide) echo $(1)

define _apkcerts_write_line

$(hide) echo -n 'name="$(1).apk" certificate="$2" private_key="$3"' >> $5

$(if $(4), $(hide) echo -n ' compressed="$4"' >> $5)

$(hide) echo '' >> $5



endef
@@ -440,12 +442,8 @@ $(APKCERTS_FILE): 
	@rm -f $@

	$(foreach p,$(PACKAGES),\

	  $(if $(PACKAGES.$(p).EXTERNAL_KEY),\

	    $(call _apkcerts_echo_with_newline,\

	      'name="$(p).apk" certificate="EXTERNAL" \

	      private_key=""' >> $@),\

	    $(call _apkcerts_echo_with_newline,\

	      'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \

	      private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@)))

	    $(call _apkcerts_write_line,$(p),"EXTERNAL","",$(PACKAGES.$(p).COMPRESSED),$@),\

	    $(call _apkcerts_write_line,$(p),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$@)))

	# In case value of PACKAGES is empty.

	$(hide) touch $@

core/package_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ endif 
endif



ifdef LOCAL_COMPRESSED_MODULE

PACKAGES.$(LOCAL_PACKAGE_NAME).COMPRESSED := gz

LOCAL_BUILT_MODULE_STEM := package.apk.gz

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk.gz

else  # !LOCAL_COMPRESSED_MODULE

core/prebuilt_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ endif # LOCAL_COMPRESSED_MODULE 


ifndef LOCAL_INSTALLED_MODULE_STEM

ifdef LOCAL_COMPRESSED_MODULE

PACKAGES.$(LOCAL_MODULE).COMPRESSED := gz

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk.gz

else

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk