fe15dd1eb7
Extra VNDKs are now installed under /system_ext in APEX format with a phony target "vndk_apex_snapshot_package". There are still files remained in /system/etc(*.libraries.<VER>.txt) which are installed with "vndk_snapshot_packages". These files are already packaged into VNDK APEXes, but linkerconfig and libnativeloader still use them from /system/etc.(b/145184886) Bug: 137802149 Test: lunch aosp_arm64 && flash system.img on Q device && boot Change-Id: I94c340d6f1c1af6ab1ae93c22b0a98fd4c10262e
208 lines
8.2 KiB
Makefile
208 lines
8.2 KiB
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
|
|
#####################################################################
|
|
# list of vndk libraries from the source code.
|
|
INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE)
|
|
|
|
#####################################################################
|
|
# This is the up-to-date list of vndk libs.
|
|
# TODO(b/62012285): the lib list should be stored somewhere under
|
|
# /prebuilts/vndk
|
|
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
|
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/$(PLATFORM_VNDK_VERSION).txt
|
|
ifeq ($(wildcard $(LATEST_VNDK_LIB_LIST)),)
|
|
$(error $(LATEST_VNDK_LIB_LIST) file not found. Please copy "$(LOCAL_PATH)/current.txt" to "$(LATEST_VNDK_LIB_LIST)" and commit a CL for release branch)
|
|
endif
|
|
else
|
|
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
|
|
endif
|
|
|
|
#####################################################################
|
|
# Check the generate list against the latest list stored in the
|
|
# source tree
|
|
.PHONY: check-vndk-list
|
|
|
|
# Check if vndk list is changed
|
|
droidcore: check-vndk-list
|
|
|
|
check-vndk-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-list-timestamp
|
|
check-vndk-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vndk)/check-abi-dump-list-timestamp
|
|
|
|
ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|)
|
|
# TODO(b/110429754) remove this condition when we support 64-bit-only device
|
|
check-vndk-list: ;
|
|
else ifeq ($(TARGET_BUILD_PDK),true)
|
|
# b/118634643: don't check VNDK lib list when building PDK. Some libs (libandroid_net.so
|
|
# and some render-script related ones) can't be built in PDK due to missing frameworks/base.
|
|
check-vndk-list: ;
|
|
else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)
|
|
check-vndk-list: ;
|
|
else ifeq ($(BOARD_VNDK_VERSION),)
|
|
# b/143233626 do not check vndk-list when vndk libs are not built
|
|
check-vndk-list: ;
|
|
else
|
|
check-vndk-list: $(check-vndk-list-timestamp)
|
|
ifneq ($(SKIP_ABI_CHECKS),true)
|
|
check-vndk-list: $(check-vndk-abi-dump-list-timestamp)
|
|
endif
|
|
endif
|
|
|
|
_vndk_check_failure_message := " error: VNDK library list has been changed.\n"
|
|
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
|
_vndk_check_failure_message += " Changing the VNDK library list is not allowed in API locked branches."
|
|
else
|
|
_vndk_check_failure_message += " Run update-vndk-list.sh to update $(LATEST_VNDK_LIB_LIST)"
|
|
endif
|
|
|
|
$(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh
|
|
$(hide) ( diff --old-line-format="Removed %L" \
|
|
--new-line-format="Added %L" \
|
|
--unchanged-line-format="" \
|
|
$(LATEST_VNDK_LIB_LIST) $(INTERNAL_VNDK_LIB_LIST) \
|
|
|| ( echo -e $(_vndk_check_failure_message); exit 1 ))
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) touch $@
|
|
|
|
#####################################################################
|
|
# Script to update the latest VNDK lib list
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := update-vndk-list.sh
|
|
LOCAL_MODULE_CLASS := EXECUTABLES
|
|
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
|
|
LOCAL_IS_HOST_MODULE := true
|
|
include $(BUILD_SYSTEM)/base_rules.mk
|
|
$(LOCAL_BUILT_MODULE): PRIVATE_INTERNAL_VNDK_LIB_LIST := $(INTERNAL_VNDK_LIB_LIST)
|
|
$(LOCAL_BUILT_MODULE): PRIVATE_LATEST_VNDK_LIB_LIST := $(LATEST_VNDK_LIB_LIST)
|
|
$(LOCAL_BUILT_MODULE):
|
|
@echo "Generate: $@"
|
|
@mkdir -p $(dir $@)
|
|
@rm -f $@
|
|
$(hide) echo "#!/bin/bash" > $@
|
|
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
|
$(hide) echo "echo Updating VNDK library list is NOT allowed in API locked branches." >> $@; \
|
|
echo "exit 1" >> $@
|
|
else
|
|
$(hide) echo "if [ -z \"\$${ANDROID_BUILD_TOP}\" ]; then" >> $@; \
|
|
echo " echo Run lunch or choosecombo first" >> $@; \
|
|
echo " exit 1" >> $@; \
|
|
echo "fi" >> $@; \
|
|
echo "cd \$${ANDROID_BUILD_TOP}" >> $@; \
|
|
echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@; \
|
|
echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@
|
|
endif
|
|
@chmod a+x $@
|
|
|
|
#####################################################################
|
|
# Check that all ABI reference dumps have corresponding NDK/VNDK
|
|
# libraries.
|
|
|
|
# $(1): The directory containing ABI dumps.
|
|
# Return a list of ABI dump paths ending with .so.lsdump.
|
|
define find-abi-dump-paths
|
|
$(if $(wildcard $(1)), \
|
|
$(addprefix $(1)/, \
|
|
$(call find-files-in-subdirs,$(1),"*.so.lsdump" -and -type f,.)))
|
|
endef
|
|
|
|
VNDK_ABI_DUMP_DIR := prebuilts/abi-dumps/vndk/$(PLATFORM_VNDK_VERSION)
|
|
NDK_ABI_DUMP_DIR := prebuilts/abi-dumps/ndk/$(PLATFORM_VNDK_VERSION)
|
|
VNDK_ABI_DUMPS := $(call find-abi-dump-paths,$(VNDK_ABI_DUMP_DIR))
|
|
NDK_ABI_DUMPS := $(call find-abi-dump-paths,$(NDK_ABI_DUMP_DIR))
|
|
|
|
$(check-vndk-abi-dump-list-timestamp): $(VNDK_ABI_DUMPS) $(NDK_ABI_DUMPS)
|
|
$(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \
|
|
$(addsuffix .so.lsdump,$(filter-out $(NDK_MIGRATED_LIBS) $(VNDK_PRIVATE_LIBRARIES),$(LLNDK_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(VNDK_CORE_LIBRARIES))), \
|
|
$(notdir $(VNDK_ABI_DUMPS))))))
|
|
$(if $(added_vndk_abi_dumps), \
|
|
echo -e "Found ABI reference dumps for non-VNDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dumps.")
|
|
|
|
$(eval added_ndk_abi_dumps := $(strip $(sort $(filter-out \
|
|
$(addsuffix .so.lsdump,$(NDK_MIGRATED_LIBS)), \
|
|
$(notdir $(NDK_ABI_DUMPS))))))
|
|
$(if $(added_ndk_abi_dumps), \
|
|
echo -e "Found ABI reference dumps for non-NDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(NDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_ndk_abi_dumps)) ')' -delete\` to delete the dumps.")
|
|
|
|
$(if $(added_vndk_abi_dumps)$(added_ndk_abi_dumps),exit 1)
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) touch $@
|
|
|
|
#####################################################################
|
|
# VNDK package and snapshot.
|
|
|
|
ifneq ($(BOARD_VNDK_VERSION),)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := vndk_package
|
|
# 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))
|
|
|
|
ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)
|
|
LOCAL_REQUIRED_MODULES += \
|
|
llndk.libraries.txt \
|
|
vndksp.libraries.txt \
|
|
vndkcore.libraries.txt \
|
|
vndkprivate.libraries.txt \
|
|
vndkcorevariant.libraries.txt \
|
|
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
|
|
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
|
|
com.android.vndk.current
|
|
endif
|
|
include $(BUILD_PHONY_PACKAGE)
|
|
|
|
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
|
|
# 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,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver)_$(TARGET_ARCH)$(_binder32))
|
|
_binder32 :=
|
|
include $(BUILD_PHONY_PACKAGE)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := vndk_apex_snapshot_package
|
|
LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))
|
|
include $(BUILD_PHONY_PACKAGE)
|
|
|
|
endif # BOARD_VNDK_VERSION is set
|
|
|
|
#####################################################################
|
|
# skip_mount.cfg, read by init to skip mounting some partitions when GSI is used.
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := gsi_skip_mount.cfg
|
|
LOCAL_MODULE_STEM := skip_mount.cfg
|
|
LOCAL_SRC_FILES := $(LOCAL_MODULE)
|
|
LOCAL_MODULE_CLASS := ETC
|
|
LOCAL_SYSTEM_EXT_MODULE := true
|
|
LOCAL_MODULE_RELATIVE_PATH := init/config
|
|
|
|
# Adds a symlink under /system/etc/init/config pointing to /system/system_ext/etc/init/config
|
|
# because first-stage init in Android 10.0 will read the skip_mount.cfg from /system/etc/* after
|
|
# chroot /system.
|
|
# TODO: remove this symlink when no need to support new GSI on Android 10.
|
|
# The actual file needs to be under /system/system_ext because it's GSI-specific and does not
|
|
# belong to core CSI.
|
|
LOCAL_POST_INSTALL_CMD := \
|
|
mkdir -p $(TARGET_OUT)/etc/init; \
|
|
ln -sf /system/system_ext/etc/init/config $(TARGET_OUT)/etc/init/config
|
|
|
|
include $(BUILD_PREBUILT)
|
|
|
|
#####################################################################
|
|
# init.gsi.rc, GSI-specific init script.
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := init.gsi.rc
|
|
LOCAL_SRC_FILES := $(LOCAL_MODULE)
|
|
LOCAL_MODULE_CLASS := ETC
|
|
LOCAL_SYSTEM_EXT_MODULE := true
|
|
LOCAL_MODULE_RELATIVE_PATH := init
|
|
|
|
include $(BUILD_PREBUILT)
|