Revert "Change LibartImgDeviceBaseAddress to 0x60000000"
This reverts commit 0c7bb7f31bca689544cd96ec484d1ab3c52cf5b8.
Reason for revert: Some tests failing
Change-Id: I354ab0055aa8a7dea688422871d13aa78fa0018d
Exempt-From-Owner-Approval: bypass
Test: make
Bug: 112670831
Bug: 115828232
diff --git a/android/config.go b/android/config.go
index 942b826..3ef202b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -660,7 +660,16 @@
}
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 {