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

Commit f58fd52b authored by Jiyong Park's avatar Jiyong Park Committed by Baligh Uddin
Browse files

Stem names are used in apkcerts.txt 

_apkcerts_write_line has assumed that the stem name of a package is the
same as the module of it. That assumption however breaks for
APK-in-APEX, in which case the stem name is Foo while the module name is
Foo.com.android.bar (where com.android.bar is the name of the APEX where
the APK is in).

Fixing the issue by recording the stem name and use it.

Bug: 155440232
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m apkcerts-list
and check the generat4ed apkcerts txt file to see that it has
Tethering.apk instead of Tethering.com.android.tethering.apex

Change-Id: I56bc55e2231eb946617a9d6f97d55c9b61f3bff7
parent 345baa7c

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ endif 
# -----------------------------------------------------------------

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

# Use a macro to add newline to each echo command

# $1 package name

# $1 stem name of the package

# $2 certificate

# $3 private key

# $4 compressed
@@ -893,8 +893,8 @@ $(APKCERTS_FILE): 
	@rm -f $@

	$(foreach p,$(sort $(PACKAGES)),\

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

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

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

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

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

	# In case value of PACKAGES is empty.

	$(hide) touch $@

core/soong_app_prebuilt.mk

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,12 @@ endif 
include $(BUILD_SYSTEM)/app_certificate_validate.mk

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))



ifneq ($(LOCAL_MODULE_STEM),)

  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)

else

  PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)

endif



# Set a actual_partition_tag (calculated in base_rules.mk) for the package.

PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag)