commit 847d902cc274d0c317fd94b5b5a058cba94828c6
author Andreas Gampe <agampe@google.com> Wed May 20 23:28:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 20 23:28:04 2015 +0000
tree 6734d725b1d1268ddb02fc873e48acecf70eed59
parent 22efeba85d4056143e34ed9a212a48a206d2f5b8
parent 0ae3bf872d3898ed6826216f3f8a04c819e1426b

Merge "ART: Fix gtest dependency"

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index e3fb92e..bfc8956 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -418,7 +418,7 @@
   LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION)
   LOCAL_SRC_FILES := $$(art_gtest_filename)
   LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime $$(art_gtest_extra_c_includes)
-  LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libart-disassembler
+  LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libartd-disassembler
   LOCAL_WHOLE_STATIC_LIBRARIES += libsigchain
 
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk