aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android/config.go13
-rw-r--r--root.bp1
2 files changed, 14 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go
index 196df558..6c524e1a 100644
--- a/android/config.go
+++ b/android/config.go
@@ -360,6 +360,19 @@ func (c *config) Android64() bool {
return false
}
+func (c *config) LibartImgHostBaseAddress() string {
+ return "0x60000000"
+}
+
+func (c *config) LibartImgDeviceBaseAddress() string {
+ switch c.Targets[Device][0].Arch.ArchType {
+ default:
+ return "0x70000000"
+ case Mips, Mips64:
+ return "0x30000000"
+ }
+}
+
func (c *deviceConfig) Arches() []Arch {
var arches []Arch
for _, target := range c.config.Targets[Device] {
diff --git a/root.bp b/root.bp
index 4b03cf14..c4f2d573 100644
--- a/root.bp
+++ b/root.bp
@@ -6,6 +6,7 @@ subdirs = [
]
optional_subdirs = [
+ "art",
"bionic",
"build/kati",
"build/tools/*",