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

Commit bb0ec8c5 authored by Jiyong Park's avatar Jiyong Park
Browse files

Correctly gather boot jars from APEXes 

Jars in APEXes have Make module names <jar_name>.<apex_name>. e.g.
updatable-apex.com.android.media. Previously, we have used <jar_name>
which actually meant the platform variant of the jar. This is not only
incorrect, but also is causing problem as the platform variant is no
longer available when the jar is configured to be available only for the
corresponding APEX (via the apex_available property).

Fixing the problem by correctly using <jar_name>.<apex_name> scheme.

Bug: N/A
Test: m

Change-Id: I6e255ce88c9bd80120b29197fb2637a64010f531
parent 7f09658f

core/tasks/boot_jars_package_check.mk

+17 −4
Original line number Diff line number Diff line
@@ -22,10 +22,23 @@ ifdef PRODUCT_BOOT_JARS 


intermediates := $(call intermediates-dir-for, PACKAGING, boot-jars-package-check,,COMMON)

stamp := $(intermediates)/stamp



# The actual names for the updatable jars are <jar_name>.<apex_name> e.g., updatable-media.com.android.media

updatable_boot_jars := $(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),\

  $(eval apex := $(call word-colon,1,$(pair)))\

  $(eval jar := $(call word-colon,2,$(pair)))\

  $(jar).$(apex)\

)

#TODO(jiyong) merge art_boot_jars into updatable_boot_jars

art_boot_jars := $(addsuffix .com.android.art.release,$(filter $(ART_APEX_JARS),$(PRODUCT_BOOT_JARS)))

conscrypt_boot_jars := $(addsuffix .com.android.conscrypt,$(filter conscrypt, $(PRODUCT_BOOT_JARS)))

noncore_boot_jars := $(filter-out $(ART_APEX_JARS) conscrypt, $(PRODUCT_BOOT_JARS))

built_boot_jars := $(foreach j, $(art_boot_jars) $(conscrypt_boot_jars) $(noncore_boot_jars), \



platform_boot_jars := $(filter-out \

  $(ART_APEX_JARS)\

  $(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),$(call word-colon,2,$(pair))),\

  $(PRODUCT_BOOT_JARS)\

)



built_boot_jars := $(foreach j, $(updatable_boot_jars) $(art_boot_jars) $(platform_boot_jars), \

  $(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar)

script := build/make/core/tasks/check_boot_jars/check_boot_jars.py

whitelist_file := build/make/core/tasks/check_boot_jars/package_whitelist.txt