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

Commit e059bdeb authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge "Revert "Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""""" am: 85808a80 

am: f889ac5e

Change-Id: I793657fd68426f86cfb8e2f5d60e58b3ccf66d6d
parents bd670e4d f889ac5e

target/product/gsi/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ LOCAL_REQUIRED_MODULES += \ 
    vndkprivate.libraries.txt \

    vndkcorevariant.libraries.txt \

    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \

    com.android.vndk.current

endif

include $(BUILD_PHONY_PACKAGE)
@@ -157,8 +158,11 @@ ifneq ($(TARGET_IS_64_BIT),true) 
_binder32 := _binder32

endif

endif

# Phony targets are installed for **.libraries.txt files.

# TODO(b/141450808): remove following VNDK phony targets when **.libraries.txt files are provided by apexes.

LOCAL_REQUIRED_MODULES := \

    $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))

LOCAL_REQUIRED_MODULES += $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))

_binder32 :=

include $(BUILD_PHONY_PACKAGE)