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

Commit 31716769 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: 3bbbe3f0 

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



Change-Id: Ief29a5914308940e97c57190a991c2e27c69c568
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a13fbaa0 3bbbe3f0

target/product/default_art_config.mk

+5 −1
Original line number Diff line number Diff line
@@ -76,7 +76,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.