New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
addon: handle mounting of {product,vendor} on A only devices #879
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@osm0sis @mfonville please take a look as well |
Only note I have would be to make sure the variables used are local only, otherwise looks good! |
@merothh thanks for your work! |
d2cf88c
to
d8bb661
Compare
* On devices with a separate product partition, addon scripts were not able to remove AOSP counterpart apps among possibly other similar issues as well * So fix it by mounting product before we get started * While we're at it, mount vendor too since its mounted in the main installer script * Thanks to @nikhilmenghani for his input
Indeed i had tested the initial commit i PR-ed on A only (Both Dynamic / Non Dynamic). As noted in the last comment i made on the issue While i was adding the changes osm0sis mentioned above, i realized how arrays weren't exactly POSIX, so i've avoided using arrays as i did initially for The latest commit has been again tested on A only (Both Dynamic / Non Dynamic), and after you guys have one last look, it seems good to go. |
I think it looks like it'll work fine. My only thought is there's probably no reason to mount twice, just mount rw the first time for each. Also, minor caveat, I seem to recall there being some devices that report they're slot _a even though that's the only slot on the device, but it's hard to deal with broken device setups like that. 🤷♂️ |
Thanks for your comments @osm0sis I will now merge this in, thanks @merothh ! If we can think of a way to detect the broken slot_a setups that would be very welcome in a new PR :-) |
Ah yes, I always forget about the emulators 😛 |
* As osm0sis suggested [here](opengapps#879 (comment)) some A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead Reference: - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.1_r61/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead * $system_as_root is unused elsewhere, so drop that as well Reference: - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.1_r61/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead. * $system_as_root is unused elsewhere, so drop that too. Reference: - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.1_r61/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead. * $system_as_root is unused elsewhere, so drop that too. Reference: - https://android.googlesource.com/platform/build/+/532fdf4479acb50cdb480e6fdfe24f0698fcd67b%5E%21/ - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.0_r1/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead. * $system_as_root is unused elsewhere, so drop that too. Reference: - https://android.googlesource.com/platform/build/+/532fdf4479acb50cdb480e6fdfe24f0698fcd67b%5E%21/ - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.0_r1/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (opengapps#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead (as its defined for every A/B device) * $system_as_root in the installer.sh is unused elsewhere, so drop that too. Reference: - https://source.android.com/devices/tech/ota/ab/ab_implement#build-variables - https://android.googlesource.com/platform/build/+/532fdf4479acb50cdb480e6fdfe24f0698fcd67b%5E%21/ - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.0_r1/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
* As osm0sis suggested (#879 (comment)) some weird A only devices, seem to report slot as _a. * So check with ro.build.ab_update instead (as its defined for every A/B device) * $system_as_root in the installer.sh is unused elsewhere, so drop that too. Reference: - https://source.android.com/devices/tech/ota/ab/ab_implement#build-variables - https://android.googlesource.com/platform/build/+/532fdf4479acb50cdb480e6fdfe24f0698fcd67b%5E%21/ - https://android.googlesource.com/platform/build/+/refs/tags/android-7.1.0_r1/tools/buildinfo.sh#26 - https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/tools/buildinfo.sh#28
On devices with a separate product partition, addon scripts were
not able to remove AOSP counterpart apps among possibly other
similar issues as well
So fix it by mounting product before we get started
While we're at it, mount vendor too since its mounted in the
main installer script
Thanks to @nikhilmenghani for his input
Fixes #872 for A only devices.