diff options
| author | Roland Levillain <rpl@google.com> | 2015-12-16 07:32:10 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-16 07:32:10 -0800 |
| commit | a3f245d4e90bdd5f54563c56322105e6ffe1f48f (patch) | |
| tree | e10b9410dc31da6face039534aa785475c2eaa8f /Android.mk | |
| parent | 03e77ecbc48831290166479d445ffc0350110b48 (diff) | |
| parent | 1660132f6885de43ee469c38aefc8214b48d89bd (diff) | |
| download | android_art-a3f245d4e90bdd5f54563c56322105e6ffe1f48f.tar.gz android_art-a3f245d4e90bdd5f54563c56322105e6ffe1f48f.tar.bz2 android_art-a3f245d4e90bdd5f54563c56322105e6ffe1f48f.zip | |
Merge "Revert "Revert "Introduce support for hardware simulators, starting with ARM64""" am: 4741516396
am: 1660132f68
* commit '1660132f6885de43ee469c38aefc8214b48d89bd':
Revert "Revert "Introduce support for hardware simulators, starting with ARM64""
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index d6d44ab1d6..35cb641510 100644 --- a/Android.mk +++ b/Android.mk @@ -77,6 +77,7 @@ include $(art_path)/build/Android.cpplint.mk # 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 |