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

Commit 96386f24 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove vnd*.libraries.txt from /system/etc" am: 889a8bbc 

Change-Id: Ie25d9a6050c25ca352eb8a67164e72df63325d8e
parents 0115d24f 889a8bbc

target/product/gsi/Android.mk

+0 −19
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ LOCAL_REQUIRED_MODULES := \ 


ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)

LOCAL_REQUIRED_MODULES += \

    llndk.libraries.txt \

    vndksp.libraries.txt \

    vndkcore.libraries.txt \

    vndkprivate.libraries.txt \

    vndkcorevariant.libraries.txt \

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

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
@@ -169,25 +165,10 @@ endif 
include $(BUILD_PHONY_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE := vndk_snapshot_package

_binder32 :=

ifneq ($(TARGET_USES_64_BIT_BINDER),true)

ifneq ($(TARGET_IS_64_BIT),true)

_binder32 := _binder32

endif

endif

_vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS)

ifneq ($(BOARD_VNDK_VERSION),current)

	_vndk_versions += $(BOARD_VNDK_VERSION)

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,$(_vndk_versions),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))

_binder32 :=

include $(BUILD_PHONY_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE := vndk_apex_snapshot_package

LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))

include $(BUILD_PHONY_PACKAGE)

target/product/media_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ PRODUCT_PACKAGES += \ 
    make_f2fs \

    requestsync \

    StatementService \

    vndk_snapshot_package \



PRODUCT_HOST_PACKAGES += \

    fsck.f2fs \