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

Commit 0afe300d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove module llndk_in_system in... 

Merge "Remove module llndk_in_system in build/make/target/product/gsi/Android.mk and add the required modules to auto-included-modules directly." into main
parents 1681cc9b 267956ef

core/main.mk

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

# variables being set.

define auto-included-modules

  llndk_in_system \

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

  llndk.libraries.txt \

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

  $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \

  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

target/product/gsi/Android.mk

+0 −17
Original line number Diff line number Diff line
@@ -121,20 +121,3 @@ 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)
 


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

# Define Phony module to install LLNDK modules which are installed in

# the system image

include $(CLEAR_VARS)

LOCAL_MODULE := llndk_in_system

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE



# Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB

LOCAL_REQUIRED_MODULES := \

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

    llndk.libraries.txt





include $(BUILD_PHONY_PACKAGE)