diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 110 | ||||
| -rw-r--r-- | rootdir/update_and_install_ld_config.mk | 123 |
2 files changed, 159 insertions, 74 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 3a6a5e8af..0312859e4 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -162,66 +162,6 @@ $(strip \ ) endef -# Update namespace configuration file with library lists and VNDK version -# -# $(1): Input source file (ld.config.txt) -# $(2): Output built module -# $(3): VNDK version suffix -# $(4): true if libz must be included in llndk not in vndk-sp -define update_and_install_ld_config -# If $(4) is true, move libz to llndk from vndk-sp. -$(if $(filter true,$(4)),\ - $(eval llndk_libraries_list := $(LLNDK_LIBRARIES) libz) \ - $(eval vndksp_libraries_list := $(filter-out libz,$(VNDK_SAMEPROCESS_LIBRARIES))),\ - $(eval llndk_libraries_list := $(LLNDK_LIBRARIES)) \ - $(eval vndksp_libraries_list := $(VNDK_SAMEPROCESS_LIBRARIES))) - -llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\ - $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(llndk_libraries_list)))) -private_llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\ - $(filter $(VNDK_PRIVATE_LIBRARIES),$(llndk_libraries_list)))) -vndk_sameprocess_libraries := $(call normalize-path-list,$(addsuffix .so,\ - $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(vndksp_libraries_list)))) -vndk_core_libraries := $(call normalize-path-list,$(addsuffix .so,\ - $(filter-out $(VNDK_PRIVATE_LIBRARIES),$(VNDK_CORE_LIBRARIES)))) -sanitizer_runtime_libraries := $(call normalize-path-list,$(addsuffix .so,\ - $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \ - $(UBSAN_RUNTIME_LIBRARY) \ - $(TSAN_RUNTIME_LIBRARY) \ - $(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY) \ - $(2ND_UBSAN_RUNTIME_LIBRARY) \ - $(2ND_TSAN_RUNTIME_LIBRARY))) -# If BOARD_VNDK_VERSION is not defined, VNDK version suffix will not be used. -vndk_version_suffix := $(if $(strip $(3)),-$(strip $(3))) - -$(2): PRIVATE_LLNDK_LIBRARIES := $$(llndk_libraries) -$(2): PRIVATE_PRIVATE_LLNDK_LIBRARIES := $$(private_llndk_libraries) -$(2): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $$(vndk_sameprocess_libraries) -$(2): PRIVATE_VNDK_CORE_LIBRARIES := $$(vndk_core_libraries) -$(2): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $$(sanitizer_runtime_libraries) -$(2): PRIVATE_VNDK_VERSION := $$(vndk_version_suffix) -$(2): $(1) - @echo "Generate: $$< -> $$@" - @mkdir -p $$(dir $$@) - $$(hide) sed -e 's?%LLNDK_LIBRARIES%?$$(PRIVATE_LLNDK_LIBRARIES)?g' $$< >$$@ - $$(hide) sed -i -e 's?%PRIVATE_LLNDK_LIBRARIES%?$$(PRIVATE_PRIVATE_LLNDK_LIBRARIES)?g' $$@ - $$(hide) sed -i -e 's?%VNDK_SAMEPROCESS_LIBRARIES%?$$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES)?g' $$@ - $$(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $$@ - $$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $$@ - $$(hide) sed -i -e 's?%VNDK_VER%?$$(PRIVATE_VNDK_VERSION)?g' $$@ - $$(hide) sed -i -e 's?%PRODUCT%?$$(TARGET_COPY_OUT_PRODUCT)?g' $$@ - $$(hide) sed -i -e 's?%PRODUCTSERVICES%?$$(TARGET_COPY_OUT_PRODUCTSERVICES)?g' $$@ - -llndk_libraries_list := -vndksp_libraries_list := -llndk_libraries := -private_llndk_libraries := -vndk_sameprocess_libraries := -vndk_core_libraries := -sanitizer_runtime_libraries := -vndk_version_suffix := -endef # update_and_install_ld_config - ####################################### # ld.config.txt selection variables @@ -265,21 +205,19 @@ ifeq ($(_enforce_vndk_at_runtime),true) # for VNDK enforced devices LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(eval $(call update_and_install_ld_config,\ - $(LOCAL_PATH)/etc/ld.config.txt,\ - $(LOCAL_BUILT_MODULE),\ - $(PLATFORM_VNDK_VERSION))) +ld_config_template := $(LOCAL_PATH)/etc/ld.config.txt +vndk_version := $(PLATFORM_VNDK_VERSION) +include $(LOCAL_PATH)/update_and_install_ld_config.mk else ifeq ($(_enforce_vndk_lite_at_runtime),true) # for treblized but VNDK lightly enforced devices LOCAL_MODULE_STEM := ld.config.vndk_lite.txt include $(BUILD_SYSTEM)/base_rules.mk -$(eval $(call update_and_install_ld_config,\ - $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt,\ - $(LOCAL_BUILT_MODULE),\ - $(PLATFORM_VNDK_VERSION),\ - true)) +ld_config_template := $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt +vndk_version := $(PLATFORM_VNDK_VERSION) +libz_is_llndk := true +include $(LOCAL_PATH)/update_and_install_ld_config.mk else @@ -290,6 +228,31 @@ include $(BUILD_PREBUILT) endif # ifeq ($(_enforce_vndk_at_runtime),true) +# ld.config.txt for VNDK versions older than PLATFORM_VNDK_VERSION +# are built with the VNDK libraries lists under /prebuilts/vndk. +# +# ld.config.$(VER).txt is built and installed for all VNDK versions +# listed in PRODUCT_EXTRA_VNDK_VERSIONS. +# +# $(1): VNDK version +define build_versioned_ld_config +include $(CLEAR_VARS) +LOCAL_MODULE := ld.config.$(1).txt +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_STEM := $$(LOCAL_MODULE) +include $(BUILD_SYSTEM)/base_rules.mk +ld_config_template := $(LOCAL_PATH)/etc/ld.config.txt +vndk_version := $(1) +lib_list_from_prebuilts := true +include $(LOCAL_PATH)/update_and_install_ld_config.mk +endef + +# For VNDK snapshot versions prior to 28, ld.config.txt is installed from the +# prebuilt under /prebuilts/vndk +supported_vndk_snapshot_versions := 28 +$(eval $(foreach ver,$(supported_vndk_snapshot_versions),\ + $(call build_versioned_ld_config,$(ver)))) ####################################### # ld.config.vndk_lite.txt @@ -304,11 +267,10 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) include $(BUILD_SYSTEM)/base_rules.mk -$(eval $(call update_and_install_ld_config,\ - $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt,\ - $(LOCAL_BUILT_MODULE),\ - $(PLATFORM_VNDK_VERSION),\ - true)) +ld_config_template := $(LOCAL_PATH)/etc/ld.config.vndk_lite.txt +vndk_version := $(PLATFORM_VNDK_VERSION) +libz_is_llndk := true +include $(LOCAL_PATH)/update_and_install_ld_config.mk endif # ifeq ($(_enforce_vndk_lite_at_runtime),false) diff --git a/rootdir/update_and_install_ld_config.mk b/rootdir/update_and_install_ld_config.mk new file mode 100644 index 000000000..06e04e7dd --- /dev/null +++ b/rootdir/update_and_install_ld_config.mk @@ -0,0 +1,123 @@ +##################################################################### +# Builds linker config file, ld.config.txt, from the specified template +# under $(LOCAL_PATH)/etc/*. +# +# Inputs: +# (expected to follow an include of $(BUILD_SYSTEM)/base_rules.mk) +# ld_config_template: template linker config file to use, +# e.g. $(LOCAL_PATH)/etc/ld.config.txt +# vndk_version: version of the VNDK library lists used to update the +# template linker config file, e.g. 28 +# lib_list_from_prebuilts: should be set to 'true' if the VNDK library +# lists should be read from /prebuilts/vndk/* +# libz_is_llndk: should be set to 'true' if libz must be included in +# llndk and not in vndk-sp +# Outputs: +# Builds and installs ld.config.$VER.txt or ld.config.vndk_lite.txt +##################################################################### + +# Read inputs +ld_config_template := $(strip $(ld_config_template)) +vndk_version := $(strip $(vndk_version)) +lib_list_from_prebuilts := $(strip $(lib_list_from_prebuilts)) +libz_is_llndk := $(strip $(libz_is_llndk)) + +intermediates_dir := $(call intermediates-dir-for,ETC,$(LOCAL_MODULE)) +library_lists_dir := $(intermediates_dir) +ifeq ($(lib_list_from_prebuilts),true) + library_lists_dir := prebuilts/vndk/v$(vndk_version)/$(TARGET_ARCH)/configs +endif + +llndk_libraries_file := $(library_lists_dir)/llndk.libraries.$(vndk_version).txt +vndksp_libraries_file := $(library_lists_dir)/vndksp.libraries.$(vndk_version).txt +vndkcore_libraries_file := $(library_lists_dir)/vndkcore.libraries.txt +vndkprivate_libraries_file := $(library_lists_dir)/vndkprivate.libraries.txt + +sanitizer_runtime_libraries := $(call normalize-path-list,$(addsuffix .so,\ + $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \ + $(UBSAN_RUNTIME_LIBRARY) \ + $(TSAN_RUNTIME_LIBRARY) \ + $(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY) \ + $(2ND_UBSAN_RUNTIME_LIBRARY) \ + $(2ND_TSAN_RUNTIME_LIBRARY))) +# If BOARD_VNDK_VERSION is not defined, VNDK version suffix will not be used. +vndk_version_suffix := $(if $(vndk_version),-$(vndk_version)) + +ifneq ($(lib_list_from_prebuilts),true) +ifeq ($(libz_is_llndk),true) + llndk_libraries_list := $(LLNDK_LIBRARIES) libz + vndksp_libraries_list := $(filter-out libz,$(VNDK_SAMEPROCESS_LIBRARIES)) +else + llndk_libraries_list := $(LLNDK_LIBRARIES) + vndksp_libraries_list := $(VNDK_SAMEPROCESS_LIBRARIES) +endif + +# $(1): list of libraries +# $(2): output file to write the list of libraries to +define write-libs-to-file +$(2): PRIVATE_LIBRARIES := $(1) +$(2): + echo -n > $$@ && $$(foreach lib,$$(PRIVATE_LIBRARIES),echo $$(lib).so >> $$@;) +endef +$(eval $(call write-libs-to-file,$(llndk_libraries_list),$(llndk_libraries_file))) +$(eval $(call write-libs-to-file,$(vndksp_libraries_list),$(vndksp_libraries_file))) +$(eval $(call write-libs-to-file,$(VNDK_CORE_LIBRARIES),$(vndkcore_libraries_file))) +$(eval $(call write-libs-to-file,$(VNDK_PRIVATE_LIBRARIES),$(vndkprivate_libraries_file))) +endif # ifneq ($(lib_list_from_prebuilts),true) + +# Given a file with a list of libs, filter-out the VNDK private libraries +# and write resulting list to a new file in "a:b:c" format +# +# $(1): libs file from which to filter-out VNDK private libraries +# $(2): output file with the filtered list of lib names +$(LOCAL_BUILT_MODULE): private-filter-out-private-libs = \ + paste -sd ":" $(1) > $(2) && \ + cat $(PRIVATE_VNDK_PRIVATE_LIBRARIES_FILE) | xargs -n 1 -I privatelib bash -c "sed -i 's/privatelib//' $(2)" && \ + sed -i -e 's/::\+/:/g ; s/^:\+// ; s/:\+$$//' $(2) +$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES_FILE := $(llndk_libraries_file) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SP_LIBRARIES_FILE := $(vndksp_libraries_file) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES_FILE := $(vndkcore_libraries_file) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES_FILE := $(vndkprivate_libraries_file) +$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(sanitizer_runtime_libraries) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_VERSION_SUFFIX := $(vndk_version_suffix) +$(LOCAL_BUILT_MODULE): PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir) +deps := $(llndk_libraries_file) $(vndksp_libraries_file) $(vndkcore_libraries_file) \ + $(vndkprivate_libraries_file) + +$(LOCAL_BUILT_MODULE): $(ld_config_template) $(deps) + @echo "Generate: $< -> $@" + @mkdir -p $(dir $@) + $(call private-filter-out-private-libs,$(PRIVATE_LLNDK_LIBRARIES_FILE),$(PRIVATE_INTERMEDIATES_DIR)/llndk_filtered) + $(hide) sed -e "s?%LLNDK_LIBRARIES%?$$(cat $(PRIVATE_INTERMEDIATES_DIR)/llndk_filtered)?g" $< >$@ + $(call private-filter-out-private-libs,$(PRIVATE_VNDK_SP_LIBRARIES_FILE),$(PRIVATE_INTERMEDIATES_DIR)/vndksp_filtered) + $(hide) sed -i -e "s?%VNDK_SAMEPROCESS_LIBRARIES%?$$(cat $(PRIVATE_INTERMEDIATES_DIR)/vndksp_filtered)?g" $@ + $(call private-filter-out-private-libs,$(PRIVATE_VNDK_CORE_LIBRARIES_FILE),$(PRIVATE_INTERMEDIATES_DIR)/vndkcore_filtered) + $(hide) sed -i -e "s?%VNDK_CORE_LIBRARIES%?$$(cat $(PRIVATE_INTERMEDIATES_DIR)/vndkcore_filtered)?g" $@ + + $(hide) echo -n > $(PRIVATE_INTERMEDIATES_DIR)/private_llndk && \ + cat $(PRIVATE_VNDK_PRIVATE_LIBRARIES_FILE) | \ + xargs -n 1 -I privatelib bash -c "(grep privatelib $(PRIVATE_LLNDK_LIBRARIES_FILE) || true) >> $(PRIVATE_INTERMEDIATES_DIR)/private_llndk" && \ + paste -sd ":" $(PRIVATE_INTERMEDIATES_DIR)/private_llndk | \ + sed -i -e "s?%PRIVATE_LLNDK_LIBRARIES%?$$(cat -)?g" $@ + + $(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@ + $(hide) sed -i -e 's?%VNDK_VER%?$(PRIVATE_VNDK_VERSION_SUFFIX)?g' $@ + $(hide) sed -i -e 's?%PRODUCT%?$(TARGET_COPY_OUT_PRODUCT)?g' $@ + $(hide) sed -i -e 's?%PRODUCTSERVICES%?$(TARGET_COPY_OUT_PRODUCTSERVICES)?g' $@ + +ld_config_template := +vndk_version := +lib_list_from_prebuilts := +libz_is_llndk := +intermediates_dir := +library_lists_dir := +llndk_libraries_file := +vndksp_libraries_file := +vndkcore_libraries_file := +vndkprivate_libraries_file := +deps := +sanitizer_runtime_libraries := +vndk_version_suffix := +llndk_libraries_list := +vndksp_libraries_list := +write-libs-to-file := |