diff options
| author | Jiyong Park <jiyong@google.com> | 2019-12-03 12:54:35 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-12-17 21:16:34 +0900 |
| commit | 439b829b42e557f072436613ba987b7928680433 (patch) | |
| tree | 8abd6c82fec33f4467644a78919d5640e3e83a49 /core/tasks | |
| parent | 0d7bd6be90e371b76884f01524437223fdcd7a23 (diff) | |
| download | platform_build-439b829b42e557f072436613ba987b7928680433.tar.gz platform_build-439b829b42e557f072436613ba987b7928680433.tar.bz2 platform_build-439b829b42e557f072436613ba987b7928680433.zip | |
Find the jar libraries in APEX from the correct path
JAR libraries in the ART and conscrypt APEXes are no longer built for
the platform. Therefore, the path out/target/common/<name>_intermediates
does not exist. Instead use the path
out/target/common/<libname>.<apexname>_intermediates paths for those
APEX-only jars.
Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I5fb725403ac22198e5ce6d77ca97c5f3392fabfd
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 |