commit 71da4878f2e3f0dc8b7c3a31b4f57172fde5f378
author Andreas Gampe <agampe@google.com> Wed Jul 26 10:02:07 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed Jul 26 11:23:03 2017 -0700
tree ae560b5e56ce09cfaaf1f3c04e96366f193c4180
parent b22ae40038aeeebb16936fbf62b48f080d6e7ef4

ART: Move simulator to art/

Move the simulator library out of the runtime directory. Let's not
pollute the runtime library.

Test: m
Change-Id: I351a0061ae628c3af0462b72d4de727db296ec23

compiler/Android.bp

diff --git a/compiler/Android.bp b/compiler/Android.bp
index b721d21..f11d256 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -423,8 +423,11 @@
         },
     },
 
+    header_libs: ["libart_simulator_headers"],
+
     shared_libs: [
         "libartd-compiler",
+        "libartd-simulator-container",
         "libvixld-arm",
         "libvixld-arm64",
 

compiler/optimizing/codegen_test_utils.h

diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h
index 1b38acd..cada2e6 100644
--- a/compiler/optimizing/codegen_test_utils.h
+++ b/compiler/optimizing/codegen_test_utils.h
@@ -28,6 +28,7 @@
 #include "arch/x86/instruction_set_features_x86.h"
 #include "arch/x86/registers_x86.h"
 #include "arch/x86_64/instruction_set_features_x86_64.h"
+#include "code_simulator.h"
 #include "code_simulator_container.h"
 #include "common_compiler_test.h"
 #include "graph_checker.h"