diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:20:54 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:20:54 -0800 |
| commit | 875ffee6f23971466f3655a9e1e73ba6a1dc0393 (patch) | |
| tree | 07b88bebf3229933589c6f98fe8ff2ae051c1181 /test/Android.libarttest.mk | |
| parent | 29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a (diff) | |
| parent | 1dff62f822392dd3f95ec23ba578bf42430ba112 (diff) | |
| download | art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.zip art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.tar.gz art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/art into HEAD
Android 6.0.1 release 3
Change-Id: I23fd56f2c1a3e8e8b993a151a794e18f3569912e
Diffstat (limited to 'test/Android.libarttest.mk')
| -rw-r--r-- | test/Android.libarttest.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index 57d06c4..26eac4c 100644 --- a/test/Android.libarttest.mk +++ b/test/Android.libarttest.mk @@ -24,6 +24,7 @@ LIBARTTEST_COMMON_SRC_FILES := \ 004-ReferenceMap/stack_walk_refmap_jni.cc \ 004-StackWalk/stack_walk_jni.cc \ 004-UnsafeTest/unsafe_test.cc \ + 044-proxy/native_proxy.cc \ 051-thread/thread_test.cc \ 116-nodex2oat/nodex2oat.cc \ 117-nopatchoat/nopatchoat.cc \ |