diff options
| -rw-r--r-- | rootdir/etc/ld.config.txt | 9 | ||||
| -rw-r--r-- | rootdir/update_and_install_ld_config.mk | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 4e2af86c7..05f75bfb0 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -330,6 +330,9 @@ additional.namespaces = runtime,system,vndk # partition (VNDK and LLNDK libraries) are not loaded here but from the # separate namespace 'system'. The delegation to the system namespace is done # via the 'namespace.default.link.system.shared_libs' property below. +# +# '#VNDK27#' TAG is only for building ld.config.27.txt for backward +# compatibility. (TODO:b/123390078) Move them to a separate file. ############################################################################### namespace.default.isolated = true namespace.default.visible = true @@ -339,11 +342,17 @@ namespace.default.search.paths += /vendor/${LIB} namespace.default.permitted.paths = /odm namespace.default.permitted.paths += /vendor +#VNDK27#namespace.default.search.paths += /vendor/${LIB}/hw +#VNDK27#namespace.default.search.paths += /vendor/${LIB}/egl namespace.default.asan.search.paths = /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} +#VNDK27#namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/hw +#VNDK27#namespace.default.asan.search.paths += /vendor/${LIB}/hw +#VNDK27#namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/egl +#VNDK27#namespace.default.asan.search.paths += /vendor/${LIB}/egl namespace.default.asan.permitted.paths = /data/asan/odm namespace.default.asan.permitted.paths += /odm diff --git a/rootdir/update_and_install_ld_config.mk b/rootdir/update_and_install_ld_config.mk index 79bed7b5a..450be6664 100644 --- a/rootdir/update_and_install_ld_config.mk +++ b/rootdir/update_and_install_ld_config.mk @@ -88,6 +88,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(sanitizer_runtim $(LOCAL_BUILT_MODULE): PRIVATE_VNDK_VERSION_SUFFIX := $(vndk_version_suffix) $(LOCAL_BUILT_MODULE): PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir) $(LOCAL_BUILT_MODULE): PRIVATE_COMP_CHECK_SCRIPT := $(compatibility_check_script) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_VERSION_TAG := \#VNDK$(vndk_version)\# deps := $(llndk_libraries_file) $(vndksp_libraries_file) $(vndkcore_libraries_file) \ $(vndkprivate_libraries_file) ifeq ($(check_backward_compatibility),true) @@ -114,10 +115,12 @@ endif paste -sd ":" $(PRIVATE_INTERMEDIATES_DIR)/private_llndk | \ sed -i.bak -e "s?%PRIVATE_LLNDK_LIBRARIES%?$$(cat -)?g" $@ - $(hide) sed -i.bak -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@ - $(hide) sed -i.bak -e 's?%VNDK_VER%?$(PRIVATE_VNDK_VERSION_SUFFIX)?g' $@ - $(hide) sed -i.bak -e 's?%PRODUCT%?$(TARGET_COPY_OUT_PRODUCT)?g' $@ - $(hide) sed -i.bak -e 's?%PRODUCT_SERVICES%?$(TARGET_COPY_OUT_PRODUCT_SERVICES)?g' $@ + $(hide) sed -i.bak -e "s?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g" $@ + $(hide) sed -i.bak -e "s?%VNDK_VER%?$(PRIVATE_VNDK_VERSION_SUFFIX)?g" $@ + $(hide) sed -i.bak -e "s?%PRODUCT%?$(TARGET_COPY_OUT_PRODUCT)?g" $@ + $(hide) sed -i.bak -e "s?%PRODUCT_SERVICES%?$(TARGET_COPY_OUT_PRODUCT_SERVICES)?g" $@ + $(hide) sed -i.bak -e "s?^$(PRIVATE_VNDK_VERSION_TAG)??g" $@ + $(hide) sed -i.bak "/^\#VNDK[0-9]\{2\}\#.*$$/d" $@ $(hide) rm -f $@.bak ld_config_template := |