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

Commit c8571790 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Define llndk modules instead of vndk_package" into main am: a8c405f2 am: 4345d8fd 

Original change: https://android-review.googlesource.com/c/platform/build/+/2756025



Change-Id: I925f784a78aafe450d6fd11733b053c0fc950cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe63f28b 4345d8fd

core/main.mk

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

# variables being set.

define auto-included-modules

  $(if $(BOARD_VNDK_VERSION),vndk_package) \

  $(if $(and $(BOARD_VNDK_VERSION),$(filter true,$(KEEP_VNDK))),vndk_package) \

  $(if $(filter true,$(KEEP_VNDK)),,llndk_in_system) \

  $(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

+16 −2
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ 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))

LOCAL_REQUIRED_MODULES := llndk_in_system



ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)

LOCAL_REQUIRED_MODULES += \
@@ -225,6 +224,21 @@ include $(BUILD_PHONY_PACKAGE) 


_vndk_versions :=



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

# 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))



include $(BUILD_PHONY_PACKAGE)



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

# skip_mount.cfg, read by init to skip mounting some partitions when GSI is used.