Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX. Bug: 145184886 Test: bulid && boot Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
This commit is contained in:
@@ -156,10 +156,6 @@ LOCAL_REQUIRED_MODULES := \
|
|||||||
|
|
||||||
ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
|
ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
|
||||||
LOCAL_REQUIRED_MODULES += \
|
LOCAL_REQUIRED_MODULES += \
|
||||||
llndk.libraries.txt \
|
|
||||||
vndksp.libraries.txt \
|
|
||||||
vndkcore.libraries.txt \
|
|
||||||
vndkprivate.libraries.txt \
|
|
||||||
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)) \
|
||||||
@@ -169,25 +165,10 @@ endif
|
|||||||
include $(BUILD_PHONY_PACKAGE)
|
include $(BUILD_PHONY_PACKAGE)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
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)
|
_vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS)
|
||||||
ifneq ($(BOARD_VNDK_VERSION),current)
|
ifneq ($(BOARD_VNDK_VERSION),current)
|
||||||
_vndk_versions += $(BOARD_VNDK_VERSION)
|
_vndk_versions += $(BOARD_VNDK_VERSION)
|
||||||
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,$(_vndk_versions),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))
|
|
||||||
_binder32 :=
|
|
||||||
include $(BUILD_PHONY_PACKAGE)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE := vndk_apex_snapshot_package
|
LOCAL_MODULE := vndk_apex_snapshot_package
|
||||||
LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))
|
LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver))
|
||||||
include $(BUILD_PHONY_PACKAGE)
|
include $(BUILD_PHONY_PACKAGE)
|
||||||
|
@@ -36,7 +36,6 @@ PRODUCT_PACKAGES += \
|
|||||||
make_f2fs \
|
make_f2fs \
|
||||||
requestsync \
|
requestsync \
|
||||||
StatementService \
|
StatementService \
|
||||||
vndk_snapshot_package \
|
|
||||||
|
|
||||||
PRODUCT_HOST_PACKAGES += \
|
PRODUCT_HOST_PACKAGES += \
|
||||||
fsck.f2fs \
|
fsck.f2fs \
|
||||||
|
Reference in New Issue
Block a user