commit 1278a6ce77e99144fe527043c316699e9a1ba439
author Mathieu Chartier <mathieuc@google.com> Fri Sep 14 19:35:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 14 19:35:45 2018 +0000
tree 1683ab1736b940080c53ecb94fb08b77a949e55a
parent ec06db2709040ec56b55e272fa541b35b9d45fdf
parent 0c7bb7f31bca689544cd96ec484d1ab3c52cf5b8

Merge "Change LibartImgDeviceBaseAddress to 0x60000000"

android/config.go

diff --git a/android/config.go b/android/config.go
index 3ef202b..942b826 100644
--- a/android/config.go
+++ b/android/config.go
@@ -660,16 +660,7 @@
 }
 
 func (c *config) LibartImgDeviceBaseAddress() string {
-	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"
-	}
+	return "0x60000000"
 }
 
 func (c *config) ArtUseReadBarrier() bool {