Revert "Change LibartImgDeviceBaseAddress to 0x60000000"

This reverts commit 0c7bb7f31b.

Reason for revert: Some tests failing

Change-Id: I354ab0055aa8a7dea688422871d13aa78fa0018d

Exempt-From-Owner-Approval: bypass
Test: make
Bug: 112670831
Bug: 115828232
This commit is contained in:
Mathieu Chartier 2018-09-18 07:09:16 +00:00
parent 0c7bb7f31b
commit d42f19cd7a
1 changed files with 10 additions and 1 deletions

View File

@ -660,7 +660,16 @@ func (c *config) LibartImgHostBaseAddress() string {
}
func (c *config) LibartImgDeviceBaseAddress() string {
return "0x60000000"
archType := Common
if len(c.Targets[Device]) > 0 {
archType = c.Targets[Device][0].Arch.ArchType
}
switch archType {
default:
return "0x70000000"
case Mips, Mips64:
return "0x5C000000"
}
}
func (c *config) ArtUseReadBarrier() bool {