Merge "Don't depend on art's boot-image-profile.txt in thin manifests" am: 3bbbe3f04e am: 3171676936

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

Change-Id: I11bc332e0abd07f6c06f400fc4e11379fa6cfa0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-05-20 00:48:50 +00:00
committed by Automerger Merge Worker

View File

@@ -83,7 +83,11 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.media:service-media-s \
com.android.permission:service-permission \
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
# Use $(wildcard) to avoid referencing the profile in thin manifests that don't have the
# art project.
ifneq (,$(wildcard art))
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
endif
# List of jars on the platform that system_server loads dynamically using separate classloaders.
# Keep the list sorted library names.