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

Commit 075d9622 authored by Cole Faust's avatar Cole Faust
Browse files

Ignore vndk compat symlinks in artifact path requirements 

A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
parent 8c0cb8f5

core/base_rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -965,6 +965,9 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE)) 
      $(my_init_rc_installed) \

      $(my_installed_test_data) \

      $(my_vintf_installed))



  ALL_MODULES.$(my_register_name).INSTALLED_SYMLINKS := $(LOCAL_SOONG_INSTALL_SYMLINKS)



  # Store the list of colon-separated pairs of the built and installed locations

  # of files provided by this module.  Used by custom packaging rules like

  # package-modules.mk that need to copy the built files to a custom install

core/main.mk

+4 −2
Original line number Diff line number Diff line
@@ -1720,8 +1720,10 @@ else ifneq ($(TARGET_BUILD_APPS),) 
    unbundled_build_modules := $(sort $(TARGET_BUILD_APPS))

  endif



  # Dist the installed files if they exist.

  apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED))

  # Dist the installed files if they exist, except the installed symlinks. dist-for-goals emits

  # `cp src dest` commands, which will fail to copy dangling symlinks.

  apps_only_installed_files := $(foreach m,$(unbundled_build_modules),\

    $(filter-out $(ALL_MODULES.$(m).INSTALLED_SYMLINKS),$(ALL_MODULES.$(m).INSTALLED)))

  $(call dist-for-goals,apps_only, $(apps_only_installed_files))



  # Dist the bundle files if they exist.

target/product/gsi_release.mk

+7 −2
Original line number Diff line number Diff line
@@ -28,10 +28,15 @@ 


BUILDING_GSI := true



# Exclude all files under system/product and system/system_ext

# Exclude all files under system/product and system/system_ext,

# and the vndk apex's compat symlinks

PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \

    system/product/% \

    system/system_ext/%

    system/system_ext/% \

    system/lib/vndk-29 \

    system/lib/vndk-sp-29 \

    system/lib64/vndk-29 \

    system/lib64/vndk-sp-29



# GSI should always support up-to-date platform features.

# Keep this value at the latest API level to ensure latest build system