tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b

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

Change-Id: I606465eb0605677407e6394276dbc4656e12860b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim 2023-09-22 05:20:46 +00:00 committed by Automerger Merge Worker
commit 8908792eba
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/main.mk
View file

@ -1235,7 +1235,8 @@ endef
# Returns modules included automatically as a result of certain BoardConfig # Returns modules included automatically as a result of certain BoardConfig
# variables being set. # variables being set.
define auto-included-modules 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_FILE),vendor_manifest.xml) \
$(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \ $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \
$(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \ $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

18
target/product/gsi/Android.mk
View file

@ -188,8 +188,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
# Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB # Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := llndk_in_system
$(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES))
ifneq ($(TARGET_SKIP_CURRENT_VNDK),true) ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
LOCAL_REQUIRED_MODULES += \ LOCAL_REQUIRED_MODULES += \
@ -225,6 +224,21 @@ include $(BUILD_PHONY_PACKAGE)
_vndk_versions := _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. # skip_mount.cfg, read by init to skip mounting some partitions when GSI is used.