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

Commit cac826f4 authored May 04, 2020 by Jiyong Park Committed by Gerrit Code Review May 04, 2020

Merge "Incorrect file names in apkcerts.txt for Make modules"

parents 6b872d79 9314d8c7

core/app_prebuilt_internal.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,12 @@ else
		$(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
		endif

		ifneq ($(LOCAL_MODULE_STEM),)
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
		else
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
		endif

		include $(BUILD_SYSTEM)/app_certificate_validate.mk

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

core/package_internal.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -694,6 +694,12 @@ endif # LOCAL_PACKAGE_SPLITS
		PACKAGES.$(LOCAL_PACKAGE_NAME).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))
		PACKAGES.$(LOCAL_PACKAGE_NAME).RESOURCE_FILES := $(all_resources)

		ifneq ($(LOCAL_MODULE_STEM),)
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM)
		else
		PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE)
		endif

		PACKAGES := $(PACKAGES) $(LOCAL_PACKAGE_NAME)

		# Reset internal variables.