diff options
author | Dario Freni <dariofreni@google.com> | 2018-08-17 00:20:11 +0100 |
---|---|---|
committer | Dario Freni <dariofreni@google.com> | 2018-08-17 00:20:11 +0100 |
commit | ad58bf9b1db76b1cd212edb11fcb9de95e0dcfcf (patch) | |
tree | ab2c896a937e3ce9f52f7100955c6c964b7b7b0c | |
parent | 6a581b7b668c2ea201d351edfe13c9f2270d5418 (diff) | |
download | system_core-ad58bf9b1db76b1cd212edb11fcb9de95e0dcfcf.tar.gz system_core-ad58bf9b1db76b1cd212edb11fcb9de95e0dcfcf.tar.bz2 system_core-ad58bf9b1db76b1cd212edb11fcb9de95e0dcfcf.zip |
s/PRODUCTSERVICES/PRODUCT_SERVICES/g
Attempting to reduce the number of different spellings we have for
"product-services" in the codebase.
Bug: 112431447
Test: m
Change-Id: I8714cc9c1ca63eb54745054aaeebd6b51f203f11
-rw-r--r-- | rootdir/etc/ld.config.txt | 24 | ||||
-rw-r--r-- | rootdir/update_and_install_ld_config.mk | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 7d22a3acc..620f0fdcb 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -8,7 +8,7 @@ dir.system = /system/bin/ dir.system = /system/xbin/ dir.system = /%PRODUCT%/bin/ -dir.system = /%PRODUCTSERVICES%/bin/ +dir.system = /%PRODUCT_SERVICES%/bin/ dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ @@ -41,7 +41,7 @@ namespace.default.isolated = true namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} -namespace.default.search.paths += /%PRODUCTSERVICES%/${LIB} +namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} # We can't have entire /system/${LIB} as permitted paths because doing so # makes it possible to load libs in /system/${LIB}/vndk* directories by @@ -54,7 +54,7 @@ namespace.default.permitted.paths = /system/${LIB}/drm namespace.default.permitted.paths += /system/${LIB}/extractors namespace.default.permitted.paths += /system/${LIB}/hw namespace.default.permitted.paths += /%PRODUCT%/${LIB} -namespace.default.permitted.paths += /%PRODUCTSERVICES%/${LIB} +namespace.default.permitted.paths += /%PRODUCT_SERVICES%/${LIB} # These are where odex files are located. libart has to be able to dlopen the files namespace.default.permitted.paths += /system/framework namespace.default.permitted.paths += /system/app @@ -69,9 +69,9 @@ namespace.default.permitted.paths += /oem/app namespace.default.permitted.paths += /%PRODUCT%/framework namespace.default.permitted.paths += /%PRODUCT%/app namespace.default.permitted.paths += /%PRODUCT%/priv-app -namespace.default.permitted.paths += /%PRODUCTSERVICES%/framework -namespace.default.permitted.paths += /%PRODUCTSERVICES%/app -namespace.default.permitted.paths += /%PRODUCTSERVICES%/priv-app +namespace.default.permitted.paths += /%PRODUCT_SERVICES%/framework +namespace.default.permitted.paths += /%PRODUCT_SERVICES%/app +namespace.default.permitted.paths += /%PRODUCT_SERVICES%/priv-app namespace.default.permitted.paths += /data namespace.default.permitted.paths += /mnt/expand @@ -100,10 +100,10 @@ namespace.default.asan.permitted.paths += /%PRODUCT%/${LIB} namespace.default.asan.permitted.paths += /%PRODUCT%/framework namespace.default.asan.permitted.paths += /%PRODUCT%/app namespace.default.asan.permitted.paths += /%PRODUCT%/priv-app -namespace.default.asan.permitted.paths += /%PRODUCTSERVICES%/${LIB} -namespace.default.asan.permitted.paths += /%PRODUCTSERVICES%/framework -namespace.default.asan.permitted.paths += /%PRODUCTSERVICES%/app -namespace.default.asan.permitted.paths += /%PRODUCTSERVICES%/priv-app +namespace.default.asan.permitted.paths += /%PRODUCT_SERVICES%/${LIB} +namespace.default.asan.permitted.paths += /%PRODUCT_SERVICES%/framework +namespace.default.asan.permitted.paths += /%PRODUCT_SERVICES%/app +namespace.default.asan.permitted.paths += /%PRODUCT_SERVICES%/priv-app namespace.default.asan.permitted.paths += /mnt/expand ############################################################################### @@ -340,7 +340,7 @@ namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /%PRODUCT%/${LIB} -namespace.system.search.paths += /%PRODUCTSERVICES%/${LIB} +namespace.system.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.system.asan.search.paths = /data/asan/system/${LIB} namespace.system.asan.search.paths += /system/${LIB} @@ -359,4 +359,4 @@ namespace.system.asan.search.paths += /product/${LIB} namespace.default.isolated = false namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} -namespace.default.search.paths += /%PRODUCTSERVICES%/${LIB} +namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} diff --git a/rootdir/update_and_install_ld_config.mk b/rootdir/update_and_install_ld_config.mk index 1b42c3205..4d6df77ae 100644 --- a/rootdir/update_and_install_ld_config.mk +++ b/rootdir/update_and_install_ld_config.mk @@ -104,7 +104,7 @@ $(LOCAL_BUILT_MODULE): $(ld_config_template) $(deps) $(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?%PRODUCTSERVICES%?$(TARGET_COPY_OUT_PRODUCTSERVICES)?g' $@ + $(hide) sed -i.bak -e 's?%PRODUCT_SERVICES%?$(TARGET_COPY_OUT_PRODUCT_SERVICES)?g' $@ $(hide) rm -f $@.bak ld_config_template := |