search

AOSPAlliance / android-prepare-vendor

Set of scripts to automate AOSP compatible vendor blobs generation from factory images
25 stars 8 forks source link

fixes for coral/flame to work with stock aosp #3

Closed dan-v closed 4 years ago

dan-v commented 4 years ago

coral/flame - add qti-telephony to product-bytecode, remove a few of the forced modules and copy instead

want to make sure this doesn't break anything on your end @chirayudesai.

chirayudesai commented 4 years ago

LGTM otherwise.

If you don't mind, maybe we can split the qc telephony bits and the other removals (if still needed?) into two commits?

dan-v commented 4 years ago

@chirayudesai - i made those removal changes as a best guess to get my image to mirror yours as the forced modules were not pulling in those missing components. i'll kick off a build with just the qti component addition only (https://github.com/RattlesnakeOS/android-prepare-vendor/commit/c1478486cd11b4fd50969f00018d65f6fe741c93) and see what the vendor diff looks like.

dan-v commented 4 years ago

@chirayudesai - yeah it appears that without those removals in the existing PR, the vendor image differs from the CalyxOS version.

this is what the vendor diff looks like with existing PR:

# diff -qr calyx/coral-qq2a.200501.001.b2/vendor ros2/coral-qq2a.200501.001.b2/vendor 2>&1 | grep -v differ | grep -v 'No such file or dir'
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.qti.hardware.display.allocator@3.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: CellBroadcastReceiver__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: EmergencyInfo__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: SettingsProvider__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Telecom__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Traceur__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Updater__auto_generated_rro_vendor.apk

this is what the vendor diff looks like with only the qti component change:

# diff -qr calyx/coral-qq2a.200501.001.b2/vendor ros3/coral-qq2a.200501.001.b2/vendor 2>&1 | grep -v differ | grep -v 'No such file or dir'
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: libqti_vndfwk_detect.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.display.config@1.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.display.config@1.1.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.display.config@1.2.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.display.config@1.3.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.qti.hardware.display.allocator@3.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.qti.hardware.display.mapper@3.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib: vendor.qti.hardware.display.mapperextensions@1.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: libqti_vndfwk_detect.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.display.config@1.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.display.config@1.1.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.display.config@1.2.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.display.config@1.3.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.qti.hardware.display.allocator@3.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.qti.hardware.display.mapper@3.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/lib64: vendor.qti.hardware.display.mapperextensions@1.0.so
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: CellBroadcastReceiver__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: EmergencyInfo__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: SettingsProvider__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Telecom__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Traceur__auto_generated_rro_vendor.apk
Only in calyx/coral-qq2a.200501.001.b2/vendor/overlay: Updater__auto_generated_rro_vendor.apk
chirayudesai commented 4 years ago

Thanks for testing.

Gotcha, those are pulled in by more caf repos.

See: https://gitlab.com/calyxos?utf8=%E2%9C%93&filter=vendor_qcom_