search

sonyxperiadev / device-sony-common

70 stars 141 forks source link

[q-mr1] Fix building #850

Closed sjllls closed 3 years ago

sjllls commented 3 years ago

Display hal moved into sm8150 dir.

Soong namespace path changed after https://github.com/sonyxperiadev/hardware-qcom-display/commit/fbfe48f6547007449ac7431f20733b79b9c171c3

MarijnS95 commented 3 years ago

Display hal moved into sm8150 dir.

Only on Android 11 (R), Q is still at the normal location and will always be: https://github.com/sonyxperiadev/local_manifests/blob/b63f361a36c6d85aa2dd66feb08220648702c0ac/qcom.xml#L9-L11. Which local_manifests branch have you synced against?

MarijnS95 commented 3 years ago

https://github.com/sonyxperiadev/vendor-qcom-opensource-commonsys-intf-display/commits/aosp/LA.UM.8.1.r1 https://github.com/sonyxperiadev/hardware-qcom-display/commits/aosp/LA.UM.8.1.r1 - I think the last few commits are problematic for Q?

sjllls commented 3 years ago

https://github.com/sonyxperiadev/vendor-qcom-opensource-commonsys-intf-display/commits/aosp/LA.UM.8.1.r1 https://github.com/sonyxperiadev/hardware-qcom-display/commits/aosp/LA.UM.8.1.r1 - I think the last few commits are problematic for Q?

Yup. soong namespace changed. It points to a wrong dir.

MarijnS95 commented 3 years ago

https://github.com/sonyxperiadev/local_manifests/pull/126 That's the missing part of the puzzle :)

Do mention it as a "Depends on https://github.com/sonyxperiadev/local_manifests/pull/126" in the PR description, makes it easier to understand what's going on 😉

sjllls commented 3 years ago

sonyxperiadev/local_manifests#126 That's the missing part of the puzzle :)

Do mention it as a "Depends on sonyxperiadev/local_manifests#126" in the PR description, makes it easier to understand what's going on 😉

Thanks!

MarijnS95 commented 3 years ago

By the way, do make a mention (for example [sjllls: Remove handling for SM8250 which is not used on Q trees] at the end of 881b4ab6b0cd8d1b452fb911846374095b25834b) in all the commits that were modified so that it is clear they are not the same as the commits on R :)

MarijnS95 commented 3 years ago

For the record: we're planning to see if we can migrate all R devices to an R-based branch (CAF 8.1 is for Q) and reset Q back to a working state, so that none of these PRs are necessary anymore. Still, thanks for your contribution @sjllls! The end result would have been almost perfect if AOSP wasn't broken!

sjllls commented 3 years ago

For the record: we're planning to see if we can migrate all R devices to an R-based branch (CAF 8.1 is for Q) and reset Q back to a working state, so that none of these PRs are necessary anymore. Still, thanks for your contribution @sjllls! The end result would have been almost perfect if AOSP wasn't broken!

No problem, life is good now. :D