commit 751beff19b36f777d9e3a966d754fd9cfad5d534
author Phil Wang <phil.wang@linaro.org> Fri Aug 28 15:17:15 2015 +0800
committer Phil Wang <phil.wang@linaro.org> Fri Nov 06 14:44:20 2015 +0800
tree 450cb7ef8cb9f955a6d689c394bd85bc9eea14f1
parent 4bbe7807f313bb8e59131812c31bf31513094f8f

Revert "Revert "Introduce support for hardware simulators, starting with ARM64""

This reverts commit 4cd27d64b0bbdde61fa3f6674ceb24221853ac2c.

This depends on VIXL 1.11.

Change-Id: I402c1fd6bbb218ba80ef8e59af203c9276151059

Android.mk

diff --git a/Android.mk b/Android.mk
index fcf70ff..fc5e227 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,6 +77,7 @@
 # product rules
 
 include $(art_path)/runtime/Android.mk
+include $(art_path)/runtime/simulator/Android.mk
 include $(art_path)/compiler/Android.mk
 include $(art_path)/dexdump/Android.mk
 include $(art_path)/dexlist/Android.mk