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

Commit 93bdc3e7 authored by Jooyung Han's avatar Jooyung Han
Browse files

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

This reverts commit ec876976.

Reason for revert:  Fix b/143374795

Change-Id: I7a9a06cb01e3cac0d15b352da76b6b8e9b45eb63
parent ec876976

target/product/gsi/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -154,7 +154,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)
@@ -166,8 +167,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)