diff options
| author | Jaekyun Seok <jaekyun@google.com> | 2017-11-28 12:10:10 +0900 |
|---|---|---|
| committer | Jaekyun Seok <jaekyun@google.com> | 2018-01-25 09:37:20 +0900 |
| commit | dff165d3a2db868689bae12db1ed8b3c74fa7d60 (patch) | |
| tree | 6237fc0bf1607237788962972b1b47ed4170f003 /rootdir | |
| parent | ccb9960bebe4e8ec7d674d8d1b778e5cd9669b48 (diff) | |
| download | core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.tar.gz core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.tar.bz2 core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.zip | |
Support /product partition
This CL will enable reading /product/build.prop and add product paths
into ld.config.txt.in.
Bug: 64195575
Test: tested with 'PRODUCT_PRODUCT_PROPERTIES := ro.product.abc=abc' on
sailfish
Change-Id: Ie996def20e25dc1afe0c74af2096af844934b2dc
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 5 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt.in | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index ca992d6ed..d8163abd3 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -88,6 +88,11 @@ ifdef BOARD_USES_VENDORIMAGE else LOCAL_POST_INSTALL_CMD += ; ln -sf /system/vendor $(TARGET_ROOT_OUT)/vendor endif +ifdef BOARD_USES_PRODUCTIMAGE + LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/product +else + LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product $(TARGET_ROOT_OUT)/product +endif ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache else diff --git a/rootdir/etc/ld.config.txt.in b/rootdir/etc/ld.config.txt.in index 2a801fad8..00d3379f9 100644 --- a/rootdir/etc/ld.config.txt.in +++ b/rootdir/etc/ld.config.txt.in @@ -55,6 +55,9 @@ namespace.default.permitted.paths += /vendor/framework namespace.default.permitted.paths += /vendor/app namespace.default.permitted.paths += /vendor/priv-app 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 += /data namespace.default.permitted.paths += /mnt/expand @@ -72,6 +75,9 @@ namespace.default.asan.permitted.paths += /vendor/framework namespace.default.asan.permitted.paths += /vendor/app namespace.default.asan.permitted.paths += /vendor/priv-app namespace.default.asan.permitted.paths += /oem/app +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 += /mnt/expand ############################################################################### |