diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2018-09-18 07:09:16 +0000 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2018-09-18 07:10:36 +0000 |
| commit | d42f19cd7a9f4b18586631ef0496278fc02fed3a (patch) | |
| tree | 4e80593e892973fa39af30be9519b4a54181a705 /android/config.go | |
| parent | 0c7bb7f31bca689544cd96ec484d1ab3c52cf5b8 (diff) | |
| download | build_soong-d42f19cd7a9f4b18586631ef0496278fc02fed3a.tar.gz build_soong-d42f19cd7a9f4b18586631ef0496278fc02fed3a.tar.bz2 build_soong-d42f19cd7a9f4b18586631ef0496278fc02fed3a.zip | |
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
Diffstat (limited to 'android/config.go')
| -rw-r--r-- | android/config.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/android/config.go b/android/config.go index 942b826a..3ef202bf 100644 --- a/android/config.go +++ b/android/config.go @@ -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 { |