Merge "Add art" am: 9bbec069a2

am: aa73de27cc

Change-Id: Ifd14f5206c372306ab5e23a85440224612ec988d

android/config.go

@@ -360,6 +360,14 @@ func (c *config) Android64() bool {
 	return false
 }
 
+func (c *config) LibartImgHostBaseAddress() string {
+	return "0x60000000"
+}
+
+func (c *config) LibartImgDeviceBaseAddress() string {
+	return "0x70000000"
+}
+
 func (c *deviceConfig) Arches() []Arch {
 	var arches []Arch
 	for _, target := range c.config.Targets[Device] {

root.bp

@@ -6,6 +6,7 @@ subdirs = [
 ]
 
 optional_subdirs = [
+    "art",
     "bionic",
     "build/kati",
     "build/tools/*",