diff options
Diffstat (limited to 'target/product/gsi/Android.mk')
| -rw-r--r-- | target/product/gsi/Android.mk | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index c491d4a593..cb4fdcb332 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -31,10 +31,6 @@ check-vndk-abi-dump-list-timestamp := $(call intermediates-dir-for,PACKAGING,vnd 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),) @@ -67,6 +63,8 @@ $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) # Script to update the latest VNDK lib list include $(CLEAR_VARS) LOCAL_MODULE := update-vndk-list.sh +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_STEM := $(LOCAL_MODULE) LOCAL_IS_HOST_MODULE := true @@ -119,7 +117,13 @@ VNDK_ABI_DUMPS := $(call find-abi-dump-paths,$(VNDK_ABI_DUMP_DIR)) NDK_ABI_DUMPS := $(call find-abi-dump-paths,$(NDK_ABI_DUMP_DIR)) PLATFORM_ABI_DUMPS := $(call find-abi-dump-paths,$(PLATFORM_ABI_DUMP_DIR)) +# Check for superfluous lsdump files. Since LSDUMP_PATHS only covers the +# libraries that can be built from source in the current build, and prebuilts of +# Mainline modules may be in use, we also allow the libs in STUB_LIBRARIES for +# NDK and platform ABIs. + $(check-vndk-abi-dump-list-timestamp): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS) +$(check-vndk-abi-dump-list-timestamp): PRIVATE_STUB_LIBRARIES := $(STUB_LIBRARIES) $(check-vndk-abi-dump-list-timestamp): $(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \ $(call filter-abi-dump-paths,LLNDK VNDK-SP VNDK-core,$(PRIVATE_LSDUMP_PATHS)), \ @@ -128,13 +132,15 @@ $(check-vndk-abi-dump-list-timestamp): echo -e "Found unexpected ABI reference dump files under $(VNDK_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dump files.") $(eval added_ndk_abi_dumps := $(strip $(sort $(filter-out \ - $(call filter-abi-dump-paths,NDK,$(PRIVATE_LSDUMP_PATHS)), \ + $(call filter-abi-dump-paths,NDK,$(PRIVATE_LSDUMP_PATHS)) \ + $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \ $(notdir $(NDK_ABI_DUMPS)))))) $(if $(added_ndk_abi_dumps), \ echo -e "Found unexpected ABI reference dump files under $(NDK_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(NDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_ndk_abi_dumps)) ')' -delete\` to delete the dump files.") $(eval added_platform_abi_dumps := $(strip $(sort $(filter-out \ - $(call filter-abi-dump-paths,PLATFORM,$(PRIVATE_LSDUMP_PATHS)), \ + $(call filter-abi-dump-paths,PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \ + $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)), \ $(notdir $(PLATFORM_ABI_DUMPS)))))) $(if $(added_platform_abi_dumps), \ echo -e "Found unexpected ABI reference dump files under $(PLATFORM_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(PLATFORM_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_platform_abi_dumps)) ')' -delete\` to delete the dump files.") @@ -150,6 +156,8 @@ ifneq ($(BOARD_VNDK_VERSION),) include $(CLEAR_VARS) LOCAL_MODULE := vndk_package +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted # 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)) @@ -165,11 +173,16 @@ endif include $(BUILD_PHONY_PACKAGE) include $(CLEAR_VARS) -_vndk_versions := $(PRODUCT_EXTRA_VNDK_VERSIONS) +_vndk_versions := +ifeq ($(filter com.android.vndk.current.on_vendor, $(PRODUCT_PACKAGES)),) + _vndk_versions += $(PRODUCT_EXTRA_VNDK_VERSIONS) +endif ifneq ($(BOARD_VNDK_VERSION),current) _vndk_versions += $(BOARD_VNDK_VERSION) endif LOCAL_MODULE := vndk_apex_snapshot_package +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver)) include $(BUILD_PHONY_PACKAGE) @@ -182,6 +195,8 @@ endif # BOARD_VNDK_VERSION is set include $(CLEAR_VARS) LOCAL_MODULE := gsi_skip_mount.cfg +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted LOCAL_MODULE_STEM := skip_mount.cfg LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC @@ -205,6 +220,20 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := init.gsi.rc +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_SYSTEM_EXT_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := init + +include $(BUILD_PREBUILT) + + +include $(CLEAR_VARS) +LOCAL_MODULE := init.vndk-nodef.rc +LOCAL_LICENSE_KINDS := legacy_restricted +LOCAL_LICENSE_CONDITIONS := restricted LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC LOCAL_SYSTEM_EXT_MODULE := true |