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

Commit 0e66a44a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8de 

Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I67a393443ca8f85ca82d086c4b92936b6b6ac9b3
parents 86779762 fd75d8de

core/Makefile

+17 −3
Original line number Diff line number Diff line
@@ -407,6 +407,16 @@ $(hide) echo '' >> $6 


endef



# -----------------------------------------------------------------

# Merge an individual apkcerts output into the final apkcerts.txt output.

# Use a macro to make it compatible with _apkcerts_write_line

# $1 apkcerts file to be merged

# $2 output file

define _apkcerts_merge

$(hide) cat $1 >> $2



endef



name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug
@@ -415,6 +425,8 @@ name := $(name)-apkcerts-$(FILE_NAME_TAG) 
intermediates := \

	$(call intermediates-dir-for,PACKAGING,apkcerts)

APKCERTS_FILE := $(intermediates)/$(name).txt

all_apkcerts_files := $(sort $(foreach p,$(PACKAGES),$(PACKAGES.$(p).APKCERTS_FILE)))

$(APKCERTS_FILE): $(all_apkcerts_files)

# We don't need to really build all the modules.

# TODO: rebuild APKCERTS_FILE if any app change its cert.

$(APKCERTS_FILE):
@@ -422,9 +434,11 @@ $(APKCERTS_FILE): 
	@mkdir -p $(dir $@)

	@rm -f $@

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

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

	    $(call _apkcerts_merge,$(PACKAGES.$(p).APKCERTS_FILE), $@),\

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

	      $(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),$@)))

	      $(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/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LOCAL_APIDIFF_NEWAPI:= 
LOCAL_APIDIFF_OLDAPI:=

LOCAL_APK_LIBRARIES:=

LOCAL_APK_SET_MASTER_FILE:=

LOCAL_APKCERTS_FILE:=

LOCAL_ARM_MODE:=

LOCAL_ASFLAGS:=

LOCAL_ASSET_DIR:=

core/soong_android_app_set.mk

+3 −11
Original line number Diff line number Diff line
@@ -31,17 +31,9 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \ 
$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

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



# android_app_set modules are always presigned

PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED

PACKAGES := $(PACKAGES) $(LOCAL_MODULE)



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)

# We can't know exactly what apk files would be outputted yet.

# Let extract_apks generate apkcerts.txt and merge it later.

PACKAGES.$(LOCAL_MODULE).APKCERTS_FILE := $(LOCAL_APKCERTS_FILE)



SOONG_ALREADY_CONV += $(LOCAL_MODULE)