commit b3f16853d5b13eb9afe9d278e7fbf01fae1d450f
author Paul Duffin <paulduffin@google.com> Thu Jun 27 12:40:25 2019 +0100
committer Paul Duffin <paulduffin@google.com> Thu Jun 27 14:37:59 2019 +0100
tree 2f01b0d77c1413b238b3c5ca23fb0983fb0e397f
parent e416f707865e0a5ffedf13a1c91495146adc895c

Move libartimagevalues to art/libartimagevalues

Bug: 136082807
Test: m otapreopt
Change-Id: I92f5c5e66505914dd89e159bdf31590abd837efd

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index de7b249..a5e52ca 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -445,9 +445,11 @@
         }
         cmd.push_back(StringPrintf("--oat-file=%s", oat_path.c_str()));
 
-        int32_t base_offset = ChooseRelocationOffsetDelta(art::GetImageMinBaseAddressDelta(),
-                                                          art::GetImageMaxBaseAddressDelta());
-        cmd.push_back(StringPrintf("--base=0x%x", art::GetImageBaseAddress() + base_offset));
+        int32_t base_offset = ChooseRelocationOffsetDelta(
+                art::imagevalues::GetImageMinBaseAddressDelta(),
+                art::imagevalues::GetImageMaxBaseAddressDelta());
+        cmd.push_back(StringPrintf("--base=0x%x",
+                art::imagevalues::GetImageBaseAddress() + base_offset));
 
         cmd.push_back(StringPrintf("--instruction-set=%s", isa));