33ff602070
In device root directory, we have the following symlinks:
- /odm/app -> /vendor/odm/app
- /odm/bin -> /vendor/odm/bin
- /odm/etc -> /vendor/odm/etc
...
This allows the Generic System Image (GSI) to be used on both devices:
1) Has a physical odm partition, where those symlink will be hidden
when /odm is used as the mount point
2) Has no physical odm partition and fallback to /vendor/odm/.
We can't just have the symlink /odm -> /vendor/odm, because the former
devices won't have /vendor/odm directory, which leads to mount failure
when the mount point /odm is resolved to /vendor/odm.
The existing /vendor/odm/build.prop won't be loaded in the latter
devices, because there is no symlink:
- /odm/build.prop -> /vendor/odm/build.prop.
Note that init blocks reading through direct symlinks (O_NOFOLLOW) so
the above symlink won't work either. This CL moves the odm build.prop
to /odm/etc/build.prop for init to load it (symlinks in earlier
components of the path will still be followed by O_NOFOLLOW).
Bug: 132128501
Test: boot a device and checks /odm/etc/build.prop is loaded
Test: make dist with an odm.img, checks $OUT/odm/etc/build.prop is loaded
Change-Id: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
Merged-In: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
(cherry picked from commit
|
||
---|---|---|
.. | ||
acp | ||
apicheck | ||
atree | ||
docker | ||
droiddoc | ||
fs_config | ||
fs_get_stats | ||
libhost | ||
makeparallel | ||
releasetools | ||
signapk | ||
signtos | ||
zipalign | ||
ziptime | ||
auto_gen_test_config.py | ||
auto_gen_test_config_test.py | ||
brillo-clang-format | ||
buildinfo.sh | ||
buildinfo_common.sh | ||
check_builds.sh | ||
check_elf_file.py | ||
check_identical_lib.sh | ||
check_link_type.py | ||
check_radio_versions.py | ||
checkowners.py | ||
compare_fileslist.py | ||
dump-package-stats | ||
event_log_tags.py | ||
extract_kernel.py | ||
fat16copy.py | ||
fileslist_util.py | ||
filter-product-graph.py | ||
findleaves.py | ||
fixlinebreaks.sh | ||
generate-enforce-rro-android-manifest.py | ||
generate-notice-files.py | ||
java-event-log-tags.py | ||
java-layers.py | ||
merge-event-log-tags.py | ||
mktarball.sh | ||
normalize_path.py | ||
OWNERS | ||
parsedeps.py | ||
post_process_props.py | ||
print_module_licenses.sh | ||
product_debug.py | ||
soong_to_convert.py | ||
test_extract_kernel.py | ||
warn.py |