Closed Bug 869327 Opened 12 years ago Closed 12 years ago

B2G Emulator: Upgrade hardware/ril, external/qemu to include RILv7/CDMA

Categories

(Firefox OS Graveyard :: Emulator, defect)

ARM
Gonk (Firefox OS)
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: edgar, Assigned: edgar)

References

Details

Attachments

(3 files)

Upgrade hardware/ril
Actually we're merging aosp jb-mr1-release. We have had already WIP branch 'next/jb-mr1-release' for both repositories for a while and just need it now to have test cases for CDMA and other RILv7 stuff.
Summary: B2G Emulator: Upgrade hardware/ril → B2G Emulator: Upgrade hardware/ril, external/qem to include RILv7/CDMA
Bug 784227 (B2G JellyBean) will upgrade Gonk to android-4.2.2_r1, which is jb-mr1.1-release. We should just follow here. It's mostly fine to merge next/jb-mr1.1-release branch in hardware/ril. However, merging next/jb-mr1.1-release branch in external/qemu brings whole a lot of changes and breaks emulator build in current ICS Gonk. The only thing we need in external/qemu is commit e9bd6b6 (complete signal strength)[1], which together with commit 9efcac5 (LTE signal strength)[2], we can now revert bug 848228, signal reporting size mismatch.[3] So, in the end, we'll merge next/jb-mr1.1-release branch to trunk in hardware/ril, revert[4] bug 848228, and cherry-pick commit e9bd6b6 to external/qemu only. [1]: https://github.com/mozilla-b2g/platform_external_qemu/commit/e9bd6b6d60a1bb12037ffa12f8194b8547fca1dd [2]: https://github.com/mozilla-b2g/platform_hardware_ril/commit/9efcac5782b93564d47c1687e67e85849c72afed [3]: https://github.com/mozilla-b2g/platform_hardware_ril/commit/bda825ae69e25158b2ed429a56da47f960febc72 [4]: The revert is actually done when merging trunk into next/jb-mr1-release. See https://github.com/mozilla-b2g/platform_hardware_ril/commit/7d5ad94f39e05a53e52190a3a7b0235f92c67f23
Depends on: 848228
Summary: B2G Emulator: Upgrade hardware/ril, external/qem to include RILv7/CDMA → B2G Emulator: Upgrade hardware/ril, external/qemu to include RILv7/CDMA
commit 5b16ef[1] in hardware/ril/ marked rild as optional so rild is not installed and fails every RIL related test cases. AOSP has commit 689f117[2] in build/, which effectively added rild back in telephony and sdk targets. [1]: https://github.com/mozilla-b2g/platform_hardware_ril/commit/5b16efdeca04c524df241af9315c8ec3bf774491 [2]: https://github.com/mozilla-b2g/platform_build/commit/689f117b6325cfb58cbb07560f503b7f7c688707
However B2G places rilproxy in gonk-misc/b2g.mk, so I think that's a better place.
external/qemu pull request
Attached file Part 2: hardware/ril pull request #14 (deleted) —
hardware/ril pull request
Attached file Part 3: gonk-misc pull request #86 (deleted) —
gonk-misc pull request
Attachment #746728 - Flags: review?(vyang)
Attachment #746735 - Flags: review?(vyang)
Attachment #746744 - Flags: review?(vyang)
Attachment #746744 - Flags: review?(vyang) → review+
Attachment #746735 - Flags: review?(vyang) → review+
Attachment #746728 - Flags: review?(vyang) → review+
Thank you :)
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Blocks: 869787
Blocks: 876369
Component: General → Emulator
OS: Windows 7 → Gonk (Firefox OS)
Hardware: x86_64 → ARM
Assignee: nobody → echen
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: