diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-19 02:11:45 +0000 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-12-19 12:35:29 +0900 |
| commit | 54aec677da76f9fa8d6e8900252679bc83e64010 (patch) | |
| tree | 0a735a02c951f0c65183f432245f4d1165b3728c /core/tasks | |
| parent | 7378ff158caf154aa9d38d7256dd59e8e88e161d (diff) | |
| download | platform_build-54aec677da76f9fa8d6e8900252679bc83e64010.tar.gz platform_build-54aec677da76f9fa8d6e8900252679bc83e64010.tar.bz2 platform_build-54aec677da76f9fa8d6e8900252679bc83e64010.zip | |
Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available
Change-Id: Ie2314d1f4cb2b92f005dfc77fcfd7ebace88e48f
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/boot_jars_package_check.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk index dc79e237d3..ba383f514b 100644 --- a/core/tasks/boot_jars_package_check.mk +++ b/core/tasks/boot_jars_package_check.mk @@ -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 |