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

Commit 83de8086 authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Remove phony module vndk_apex_snapshot_package and add its required... 

Merge "Remove phony module vndk_apex_snapshot_package and add its required modules to auto-included-modules" into main
parents fac0f429 174db7b1

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ endef 
# Returns modules included automatically as a result of certain BoardConfig

# variables being set.

define auto-included-modules

  $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \

  $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \

  llndk.libraries.txt \

  $(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \

target/product/gsi/Android.mk

+0 −12
Original line number Diff line number Diff line
@@ -109,15 +109,3 @@ $(check-abi-dump-list-timestamp): 
	$(if $(added_vndk_abi_dumps)$(added_platform_abi_dumps),exit 1)

	$(hide) mkdir -p $(dir $@)

	$(hide) touch $@
 


#####################################################################

# VNDK package and snapshot.



include $(CLEAR_VARS)



LOCAL_MODULE := vndk_apex_snapshot_package

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

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

include $(BUILD_PHONY_PACKAGE)

target/product/media_system_ext.mk

+0 −4
Original line number Diff line number Diff line
@@ -20,9 +20,5 @@ 
# base_system_ext.mk.

$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk)



# /system_ext packages

PRODUCT_PACKAGES += \

    vndk_apex_snapshot_package \



# Window Extensions

$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions_base.mk)