diff options
| author | Yifan Hong <elsk@google.com> | 2018-08-21 01:07:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-21 01:07:56 +0000 |
| commit | de39afd1e0274c3005d60884912bf825ed7d5c00 (patch) | |
| tree | 1681a6d4b936f488f54ded722537bd6f56676692 /rootdir | |
| parent | 59cd823752ad644a302192eaa3fee00206102259 (diff) | |
| parent | ab5583b5851613ba47994139fe79ef2c49992d7d (diff) | |
| download | system_core-de39afd1e0274c3005d60884912bf825ed7d5c00.tar.gz system_core-de39afd1e0274c3005d60884912bf825ed7d5c00.tar.bz2 system_core-de39afd1e0274c3005d60884912bf825ed7d5c00.zip | |
Merge "s/product-services/product_services/g"
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 4 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 4 |
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 |