summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorDario Freni <dariofreni@google.com>2018-08-17 01:01:25 +0100
committerYifan Hong <elsk@google.com>2018-08-20 17:46:42 +0000
commitab5583b5851613ba47994139fe79ef2c49992d7d (patch)
treed76352b0c50ba9da67eedd8048ea938175b2620e /rootdir
parentad58bf9b1db76b1cd212edb11fcb9de95e0dcfcf (diff)
downloadsystem_core-ab5583b5851613ba47994139fe79ef2c49992d7d.tar.gz
system_core-ab5583b5851613ba47994139fe79ef2c49992d7d.tar.bz2
system_core-ab5583b5851613ba47994139fe79ef2c49992d7d.zip
s/product-services/product_services/g
Attempting to reduce the number of different spellings we have for "product services" partition in the codebase. Bug: 112431447 Test: m Change-Id: I1a87d7e040a8b1f91f973ac7d90d6360b5b54f71 Merged-In: I1a87d7e040a8b1f91f973ac7d90d6360b5b54f71
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/Android.mk4
-rw-r--r--rootdir/etc/ld.config.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 2429b490b..fcc2d5011 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -94,9 +94,9 @@ else
LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product $(TARGET_ROOT_OUT)/product
endif
ifdef BOARD_USES_PRODUCT_SERVICESIMAGE
- LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/product-services
+ LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/product_services
else
- LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product-services $(TARGET_ROOT_OUT)/product-services
+ LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product_services $(TARGET_ROOT_OUT)/product_services
endif
ifdef BOARD_USES_METADATA_PARTITION
LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/metadata
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 620f0fdcb..f2892f8a9 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -79,8 +79,8 @@ namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /product/${LIB}
-namespace.default.asan.search.paths += /data/asan/product-services/${LIB}
-namespace.default.asan.search.paths += /product-services/${LIB}
+namespace.default.asan.search.paths += /data/asan/product_services/${LIB}
+namespace.default.asan.search.paths += /product_services/${LIB}
namespace.default.asan.permitted.paths = /data
namespace.default.asan.permitted.paths += /system/${LIB}/drm