Merge "Remove reference to VNDK current APEX" into main

This commit is contained in:
Kiyoung Kim 2024-03-18 11:40:52 +00:00 committed by Gerrit Code Review
commit d826a2355d

View file

@ -224,13 +224,7 @@ LOCAL_REQUIRED_MODULES += \
vndkcorevariant.libraries.txt \ vndkcorevariant.libraries.txt \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
$(VNDK_USING_CORE_VARIANT_LIBRARIES) \ $(VNDK_USING_CORE_VARIANT_LIBRARIES)
com.android.vndk.current
# Install VNDK apex on vendor partition if VNDK is unfrozen
ifdef UNFROZEN_VNDK
LOCAL_REQUIRED_MODULES += com.android.vndk.current.on_vendor
endif
LOCAL_ADDITIONAL_DEPENDENCIES += $(call module-built-files,\ LOCAL_ADDITIONAL_DEPENDENCIES += $(call module-built-files,\
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES))) $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES)))