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

Commit 7c6720bf authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR" 

am: 812e606a

Change-Id: I8a5bde2046c63dbd6e4500bad7c7297015730529
parents a91db618 812e606a

core/tasks/boot_jars_package_check.mk

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ ifdef PRODUCT_BOOT_JARS 


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

stamp := $(intermediates)/stamp

built_boot_jars := $(foreach j, $(PRODUCT_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), \

  $(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