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

Commit ff333b1d authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I11bc332e0abd07f6c06f400fc4e11379fa6cfa0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03e32400 31716769

target/product/default_art_config.mk

+5 −1
Original line number Diff line number Diff line
@@ -83,7 +83,11 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \ 
    com.android.media:service-media-s \

    com.android.permission:service-permission \



# 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.