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

Commit ec876976 authored by Jooyung Han's avatar Jooyung Han
Browse files

Revert "Revert "Revert "install VNDK APEX instead of VNDK libs""" 

This reverts commit 6851a276.

Reason for revert: b/143374795

Change-Id: Iff04cb2a500b4d624abeec4dbc5dcfb5a6e03397
parent 6851a276

target/product/gsi/Android.mk

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

    vndkcorevariant.libraries.txt \

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

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

    com.android.vndk.current

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))

endif

include $(BUILD_PHONY_PACKAGE)
@@ -167,11 +166,8 @@ 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)